r23503 by craig - Bump Qt version to 5.11 to fix deprecated APIs, bump about date, bump copyright date

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 15 16:14:38 UTC 2020


Author: craig
Date: Sun Mar 15 16:14:37 2020
New Revision: 23503

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23503
Log:
Bump Qt version to 5.11 to fix deprecated APIs, bump about date, bump copyright date

Modified:
    trunk/Scribus/BUILDING
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/COPYING
    trunk/Scribus/Scribus.app/Contents/Info.plist
    trunk/Scribus/scribus/ui/about.cpp
    trunk/Scribus/win32/msvc2013/scribus-main/Scribus.rc
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc

Modified: trunk/Scribus/BUILDING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/BUILDING
==============================================================================
--- trunk/Scribus/BUILDING	(original)
+++ trunk/Scribus/BUILDING	Sun Mar 15 16:14:37 2020
@@ -27,7 +27,7 @@
 Install the below packages BEFORE running CMake or compiling Scribus:
 
 Requirements:
-	Qt >= 5.10.0 (Scribus has specific code requiring Qt 5.10.0, not Qt 5.9.x or before)
+        Qt >= 5.11.0
 	Freetype >= 2.1.7 (2.3.x strongly recommended)
 	cairo >= 1.14.x
 	harfbuzz = > 0.9.42

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Sun Mar 15 16:14:37 2020
@@ -2,7 +2,7 @@
 ########## Find Dependencies                                                                        ##########
 
 #<< Qt
-set(QT_MIN_VERSION "5.10.0")
+set(QT_MIN_VERSION "5.11.0")
 set(CMAKE_PREFIX_PATH "${QT_PREFIX}/lib/cmake")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)

Modified: trunk/Scribus/COPYING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/COPYING
==============================================================================
--- trunk/Scribus/COPYING	(original)
+++ trunk/Scribus/COPYING	Sun Mar 15 16:14:37 2020
@@ -1,5 +1,5 @@
 Scribus Copyright
-Copyright 2001–2019 Franz Schmid and rest of the members of the Scribus Team.
+Copyright 2001–2020 Franz Schmid and rest of the members of the Scribus Team.
 
 The "Scribus Team" is informally defined as the following people: Franz Schmid, Peter Linnell, Craig Bradney, Jean Ghali, Hermann Kraus, Riku Leino, Oleksandr Moskalenko, Christoph Schäfer, Petr Vaněk, Andreas Vox, and Jain Basil.
 

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist	(original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist	Sun Mar 15 16:14:37 2020
@@ -57,7 +57,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus (c) 2001-2019 The Scribus Team</string>
+	<string>Scribus (c) 2001-2020 The Scribus Team</string>
 	<key>CFBundleIconFile</key>
 	<string>Scribus.icns</string>
 	<key>CFBundleIdentifier</key>

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Sun Mar 15 16:14:37 2020
@@ -114,9 +114,9 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "06";
-	QString BUILD_MONTH = CommonStrings::november;
-	QString BUILD_YEAR = "2019";
+	QString BUILD_DAY = "15";
+	QString BUILD_MONTH = CommonStrings::march;
+	QString BUILD_YEAR = "2020";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";
 	QString BUILD_NAME = "";

Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.rc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.rc
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.rc	(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.rc	Sun Mar 15 16:14:37 2020
@@ -95,7 +95,7 @@
             VALUE "FileDescription", "Scribus 1.5.6.svn"
             VALUE "FileVersion", "1.5.6"
             VALUE "InternalName", "Scribus 1.5.6.svn"
-            VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
+            VALUE "LegalCopyright", "Copyright (C) 2001-2020 by The Scribus Team"
             VALUE "OriginalFilename", "Scribus.exe"
             VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
             VALUE "ProductVersion", "1.5.6"

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23503&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.rc	Sun Mar 15 16:14:37 2020
@@ -95,7 +95,7 @@
             VALUE "FileDescription", "Scribus 1.5.6.svn"
             VALUE "FileVersion", "1.5.6"
             VALUE "InternalName", "Scribus 1.5.6.svn"
-            VALUE "LegalCopyright", "Copyright (C) 2001-2019 by The Scribus Team"
+            VALUE "LegalCopyright", "Copyright (C) 2001-2020 by The Scribus Team"
             VALUE "OriginalFilename", "Scribus.exe"
             VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
             VALUE "ProductVersion", "1.5.6"




More information about the scribus-commit mailing list