diff options
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 15 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 2 | ||||
| -rw-r--r-- | src/angle/angle.pro | 17 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 25 |
4 files changed, 25 insertions, 34 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 10d3fe3c0b..1ddc28bed0 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -13,13 +13,22 @@ load(qt_build_paths) !build_pass { qtPrepareTool(QMAKE_SYNCQT, syncqt) - contains(QT_CONFIG, private_tests): \ # -developer-build - QMAKE_SYNCQT += -check-includes - QMAKE_SYNCQT += -module $$MODULE_INCNAME -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$MODULE_BASE_OUTDIR $$MODULE_BASE_DIR + minimal_syncqt { + QMAKE_SYNCQT += -minimal $$QMAKE_SYNCQT_OPTIONS + } else { + contains(QT_CONFIG, private_tests): \ # -developer-build + QMAKE_SYNCQT += -check-includes + QMAKE_SYNCQT += -module $$MODULE_INCNAME + } + QMAKE_SYNCQT += \ + -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs \ + -outdir $$MODULE_BASE_OUTDIR $$MODULE_BASE_DIR !silent: message($$QMAKE_SYNCQT) system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") } +minimal_syncqt: return() + #load up the headers info include($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/headers.pri, "", true) diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index b74e5dd73f..2822e70b05 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -43,7 +43,7 @@ else: \ module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG" else: \ module_config = - !no_module_headers { + !no_module_headers:!minimal_syncqt { MODULE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME" MODULE_PRIVATE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION \ \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME" diff --git a/src/angle/angle.pro b/src/angle/angle.pro index 00e0501d60..371e39868f 100644 --- a/src/angle/angle.pro +++ b/src/angle/angle.pro @@ -1,19 +1,10 @@ TEMPLATE = subdirs SUBDIRS += src -# We need to call syncqt manually instead of using "load(qt_module_headers)" for several reasons: +# We do it this way instead of letting load(qt_module) handle it for two reasons: # 1) qt_module_headers assumes the TARGET is the same as the include directory (eg: libGLESv2 != GLES2) # 2) If we made a 'QtANGLE' module, the include directory would be flattened which won't work since # we need to support "#include <GLES2/gl2.h>" -!build_pass { - qtPrepareTool(QMAKE_SYNCQT, syncqt) - QTDIR = $$[QT_HOST_PREFIX] - exists($$QTDIR/.qmake.cache): \ - mod_component_base = $$QTDIR - else: \ - mod_component_base = $$dirname(_QMAKE_CACHE_) - QMAKE_SYNCQT += -minimal -module KHR -module EGL -module GLES2 \ - -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_) - !silent:message($$QMAKE_SYNCQT) - system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") -} +CONFIG += minimal_syncqt +QMAKE_SYNCQT_OPTIONS = -module KHR -module EGL -module GLES2 +load(qt_module_headers) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index cc7d40c43e..ea1d087b59 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -2,7 +2,7 @@ option(host_build) TARGET = QtBootstrap QT = -CONFIG += no_module_headers internal_module +CONFIG += internal_module !build_pass: CONFIG += release # otherwise mingw headers do not declare common functions like putenv @@ -37,6 +37,13 @@ MODULE_PRIVATE_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \ \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml +# We need the forwarding headers before their respective modules are built, +# so do a minimal syncqt run. +CONFIG += minimal_syncqt +QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml +contains(QT_CONFIG, zlib): \ + QMAKE_SYNCQT_OPTIONS += -module QtZlib + load(qt_module) INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global @@ -128,19 +135,3 @@ win32:LIBS += -luser32 -lole32 -ladvapi32 lib.CONFIG = dummy_install INSTALLS += lib - -!build_pass { - # We need the forwarding headers before their respective modules are built, - # so do a minimal syncqt run. - qtPrepareTool(QMAKE_SYNCQT, syncqt) - QTDIR = $$[QT_HOST_PREFIX] - exists($$QTDIR/.qmake.cache): \ - mod_component_base = $$QTDIR - else: \ - mod_component_base = $$dirname(_QMAKE_CACHE_) - QMAKE_SYNCQT += -minimal -module QtCore -module QtDBus -module QtXml \ - -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_) - contains(QT_CONFIG, zlib):QMAKE_SYNCQT += -module QtZlib - !silent:message($$QMAKE_SYNCQT) - system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") -} |