Merge pull request #243 from FashionFreedom/issue-242_Qt5.12

Update to Qt 5.12.x, QtCreator 4.11.x

README.md

@@ -52,8 +52,8 @@ ___________________________________________________
 ## Build Seamly2D
 
 Basic Software Prerequisites:  
-* Qt 5.7.0 or later - https://www.qt.io/download-open-source (includes Qt, QtCreator, and QtChooser)
-* QtCreator 4.3.1 or later (to build code)
+* Qt 5.12.0 or later - https://www.qt.io/download-open-source (includes Qt, QtCreator, and QtChooser)
+* QtCreator 4.11.2 or later (to build code)
 * QtChooser (to select or update Qt version)
 * Git - either Git from https://git-scm.com/downloads or Github Desktop (recommended for Windows and Mac) from https://desktop.github.com/
 * Compiler - either gcc from https://gcc.gnu.org, or mingw from https://sourceforge.net/projects/mingw/

README.txt

@@ -51,8 +51,8 @@ Building Seamly2D
 ================
 
 Basic Prerequisites:
-   * Qt 5.7.0 or later - https://www.qt.io/download-open-source (includes Qt, QtCreator, and QtChooser)
-   * QtCreator 4.3.1 or later (to build code)
+   * Qt 5.12.0 or later - https://www.qt.io/download-open-source (includes Qt, QtCreator, and QtChooser)
+   * QtCreator 4.11.2 or later (to build code)
    * QtChooser (to select or update Qt version)
    * Git - either Git from https://git-scm.com/downloads or Github Desktop (recommended for Windows and Mac) from https://desktop.github.com/
    * Compiler - gcc from https://gcc.gnu.org, clang from https://clang.llvm.org/, or mingw from https://sourceforge.net/projects/mingw/

Seamly2D.pro

@@ -1,10 +1,10 @@
 include(common.pri)
 
 message("Entering Seamly2D.pro")
-#Check if Qt version >= 5.7.0
-#!minQtVersion(5, 7, 0) {
+#Check if Qt version >= 5.12.0
+#!minQtVersion(5, 12, 0) {
 #    message("Seamly2D.pro: Cannot build Seamly2D with Qt version $${QT_VERSION}.")
-#    error("Use at least Qt 5.7.0.")
+#    error("Use at least Qt 5.12.0.")
 #}
 
 #These checks need because we can quote all paths that contain space.

scripts/macfixqtdylibrpath.py

@@ -7,7 +7,7 @@
 import sys
 import getopt
 
-# ./macfixqtdylibrpath.py ./Seamly2D.app /Users/dismine/Qt5.7.0/5.7/clang_64/bin/qmake
+# ./macfixqtdylibrpath.py ./Seamly2D.app /Users/dismine/Qt5.12.0/5.12/clang_64/bin/qmake
 def usage():
   print "Usage: %s <path_to_bundle_root_directory> [qmake_path]" % os.path.basename(sys.argv[0])
 
@@ -38,11 +38,11 @@ def findQtLibraries(filter):
   wholefiles = []
   for root, subdirs, filenames in os.walk('.'):
     for filename in filenames:
-      wholefiles.append(os.path.join(root, filename))  
+      wholefiles.append(os.path.join(root, filename))
 
   filtered = []
   for filtered_file in fnmatch.filter(wholefiles, filter):
-    filtered.append(filtered_file)  
+    filtered.append(filtered_file)
   return filtered
 
 def which(program):
@@ -110,7 +110,7 @@ def main():
   print "qmake path: " + qmake_bin
 
   QT_INSTALL_LIBS = readQmakeVar(qmake_bin, 'QT_INSTALL_LIBS')
-  print "Path to Qt libraries: " + QT_INSTALL_LIBS 
+  print "Path to Qt libraries: " + QT_INSTALL_LIBS
 
   fixFrameworks(QT_INSTALL_LIBS)
   fixDylibs(QT_INSTALL_LIBS)

src/test/CollectionTest/target_wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-LD_LIBRARY_PATH=/home/susan/Qt/5.7/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=/home/susan/Qt/5.12/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
-QT_PLUGIN_PATH=/home/susan/Qt/5.7/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
+QT_PLUGIN_PATH=/home/susan/Qt/5.12/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
 export QT_PLUGIN_PATH
 exec "$@"

src/test/ParserTest/target_wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-LD_LIBRARY_PATH=/home/susan/Qt/5.7/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=/home/susan/Qt/5.12/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
-QT_PLUGIN_PATH=/home/susan/Qt/5.7/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
+QT_PLUGIN_PATH=/home/susan/Qt/5.12/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
 export QT_PLUGIN_PATH
 exec "$@"

src/test/Seamly2DTest/target_wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-LD_LIBRARY_PATH=/home/susan/Qt/5.7/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=/home/susan/Qt/5.12/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
-QT_PLUGIN_PATH=/home/susan/Qt/5.7/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
+QT_PLUGIN_PATH=/home/susan/Qt/5.12/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
 export QT_PLUGIN_PATH
 exec "$@"

src/test/TranslationsTest/target_wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-LD_LIBRARY_PATH=/home/susan/Qt/5.7/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=/home/susan/Qt/5.12/gcc_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
-QT_PLUGIN_PATH=/home/susan/Qt/5.7/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
+QT_PLUGIN_PATH=/home/susan/Qt/5.12/gcc_64/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
 export QT_PLUGIN_PATH
 exec "$@"