diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 20 | ||||
| -rw-r--r-- | mkspecs/features/testcocoon.prf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-xcode/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 1 |
7 files changed, 16 insertions, 16 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 1aa8ae5544..6a8045ab3b 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -24,7 +24,7 @@ CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5::") CMAKE_QT_INSTALL_PREFIX = $$replace($$list($$[QT_INSTALL_PREFIX]), \\\\, /)/ CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$CMAKE_QT_INSTALL_PREFIX)" -CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS] +CMAKE_INCLUDE_DIR = $$replace($$list($$[QT_INSTALL_HEADERS]), \\\\, /)/ contains(CMAKE_INCLUDE_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_INCLUDE_DIR = $$replace(CMAKE_INCLUDE_DIR, "$$CMAKE_QT_INSTALL_PREFIX_ESCAPED", ) } else { diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index aa706393a5..5d8684bf00 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -46,6 +46,10 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG } else { error("Failed to run: $$MSG") } + + # Let qmake know about the unexpectedly appearing cache file. + contains(QTFWD, -cache-module-fwd):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache + unset(QTFWD) unset(PRO_BASENAME) } diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index ad6990657b..98cdab121f 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -116,10 +116,8 @@ embedded:DEPENDPATH += ;$$EMBEDDED_H #install directives load(qt_installs) -unix { - CONFIG += create_libtool create_pc explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] - QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX +unix|win32-g++* { + CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$[QT_RAW_INSTALL_LIBS] QMAKE_PKGCONFIG_INCDIR = $$[QT_RAW_INSTALL_HEADERS]/$$TARGET QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_RAW_INSTALL_HEADERS] @@ -130,17 +128,15 @@ unix { lib_replace.replace = $$[QT_RAW_INSTALL_LIBS] prefix_replace.match = $$QT_BUILD_TREE prefix_replace.replace = $$[QT_RAW_INSTALL_PREFIX] - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace } -win32-g++* { - CONFIG += create_pc - QMAKE_PKGCONFIG_LIBDIR = $$[QT_RAW_INSTALL_LIBS] - QMAKE_PKGCONFIG_INCDIR = $$[QT_RAW_INSTALL_HEADERS]/$$TARGET - QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_RAW_INSTALL_HEADERS] - QMAKE_PKGCONFIG_DESTDIR = pkgconfig +unix { + CONFIG += create_libtool explicitlib + QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] + QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace } contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE diff --git a/mkspecs/features/testcocoon.prf b/mkspecs/features/testcocoon.prf index e6ad733540..523497dba1 100644 --- a/mkspecs/features/testcocoon.prf +++ b/mkspecs/features/testcocoon.prf @@ -11,10 +11,10 @@ TARGET_BASENAME = $$basename(QMAKE_RESOLVED_TARGET) # --cs-output defines the name to give to the execution report (.csexe). TESTCOCOON_COVERAGE_OPTIONS = \ --cs-qt4 \ - --cs-exclude-file-regex=\'(^|[/\\\\])ui_.*\\.h\$\$\' \ --cs-exclude-file-regex=\'(^|[/\\\\])(qrc|moc)_.*\\.cpp\$\$\' \ --cs-exclude-file-regex=\'.*\\.moc\$\$\' \ --cs-exclude-file-regex=\'.*\\.g\$\$\' \ + --cs-exclude-file-regex=\'.*\\.h\$\$\' \ --cs-output=\'$$TARGET_BASENAME\' # name of the csexe file (execution report) # The .csmes file should be placed alongside the .so or binary. diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 4cb462696e..de14562039 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -13,8 +13,6 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) -QMAKE_CC = -QMAKE_CXX = QMAKE_LINK = QMAKE_LINK_C = QMAKE_LINK_C_SHLIB = diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 7f41c8aab3..9dcff807fa 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -79,6 +79,7 @@ QMAKE_SH = bash MINGW_IN_SHELL = 1 QMAKE_DIR_SEP = / QMAKE_COPY = cp +QMAKE_STREAM_EDITOR = sed QMAKE_COPY_DIR = cp -R QMAKE_MOVE = mv QMAKE_DEL_FILE = rm -f diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index c1f0ac3307..641e4109ff 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -79,6 +79,7 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain QMAKE_DIR_SEP = / QMAKE_QMAKE ~= s,\\\\,/, QMAKE_COPY = cp + QMAKE_STREAM_EDITOR = sed QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv QMAKE_DEL_FILE = rm |