From c7997c1d5668985e6d05dd2b83fbe89ead029d7c Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@theqtcompany.com>
Date: Fri, 24 Apr 2015 11:18:53 +0200
Subject: [PATCH] Partially revert "Fix QtCreator loading of qtwebengine.pro"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Changing the python print signature seems to cause
problems on Windows, so revert it.
Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
tools/buildscripts/find-included-moc-files | 2 +-
tools/buildscripts/find-mocables | 2 +-
tools/qmake/mkspecs/features/functions.prf | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/buildscripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files
index c76360299..e55f3824c 100755
--- a/tools/buildscripts/find-included-moc-files
+++ b/tools/buildscripts/find-included-moc-files
@@ -10,4 +10,4 @@ for f in filter(os.path.isfile, sys.argv[1:]):
if m:
includedMocs.add(m.group(1))
for moc in includedMocs:
- print(moc)
+ print moc
diff --git a/tools/buildscripts/find-mocables b/tools/buildscripts/find-mocables
index 6c709399c..7c383cfec 100755
--- a/tools/buildscripts/find-mocables
+++ b/tools/buildscripts/find-mocables
@@ -23,4 +23,4 @@ for f in filter(os.path.isfile, sys.argv[1:]):
if re.match(".*Q_OBJECT", line):
mocables.add(f)
for mocable in mocables:
- print(mocable)
+ print mocable
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index e1864f7b3..ef0320da1 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -22,8 +22,8 @@ defineTest(isPlatformSupported) {
}
defineTest(isPythonVersionSupported) {
- python_major_version = $$system('python -c "import sys; print(sys.version_info.major)"')
- python_minor_version = $$system('python -c "import sys; print(sys.version_info.minor)"')
+ python_major_version = $$system('python -c "import sys; print sys.version_info.major"')
+ python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"')
lessThan(python_major_version, 3): greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true)
skipBuild("Using Python version "$$python_major_version"."$$python_minor_version", but Python version 2 (2.7 or later) is required to build Qt WebEngine.")
return(false)
--
GitLab