From 5260c01bbe0e59d566786157b6dae705e981bb3e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Feb 2016 17:00:59 +0100 Subject: load qt_common in qt_helper_lib this has multiple consequences: - we do sane DESTDIR replacement for debug_and_release builds, fixing QTBUG-47313 - we don't create debug/release subdirectories, fixing QTBUG-47639. this only makes sense given the complementary call of $$qt5LibraryTarget() - we patch up the .prl files upon installation Task-number: QTBUG-47313 Task-number: QTBUG-47639 Change-Id: Id409bbd26781a773409b94835ab6b97e71569322 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_helper_lib.prf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 70a17995cf..ebc629f57f 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -14,6 +14,9 @@ load(qt_build_paths) TEMPLATE = lib CONFIG -= qt +CONFIG -= warning_clean # Don't presume 3rd party code to be clean +load(qt_common) + contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release contains(QT_CONFIG, build_all): CONFIG += build_all -- cgit v1.2.3 From a5ec7163f97fe6e04bb921eb98c6da48659fc09a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 16 Dec 2015 12:47:01 +0100 Subject: unhack qt_install_headers vs. lib_bundle instead of unsetting the flag later on, don't set it in the first place. Change-Id: Id448500b02b5c3e1dc7c332cc178a84c7fd2cfdc Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module.prf | 1 - mkspecs/features/qt_module_headers.prf | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index bb28af975f..aefd3aee1c 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -116,7 +116,6 @@ lib_bundle { QMAKE_BUNDLE_EXTENSION = .framework QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib } - CONFIG -= qt_install_headers #no need to install these as well !debug_and_release|!build_all|CONFIG(release, debug|release) { FRAMEWORK_HEADERS.version = Versions FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index eb1db08405..094c854ef0 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -99,7 +99,8 @@ git_build: \ else: \ INC_PATH = $$MODULE_BASE_INDIR include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true) -CONFIG += qt_install_headers +!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. + CONFIG += qt_install_headers alien_syncqt: return() -- cgit v1.2.3 From eadd7e9cfb4e0802aa9da63badc41c39fec219bb Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 16 Feb 2016 12:41:11 +0100 Subject: Set QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO for win32-g++ The win32-g++ mkspec is not based on gcc-base, so QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO is not inherited. Therefore, -release -force-debug-info would build with neither -O2 nor -g. Change-Id: I4e97cb08f577062dd342fb3e91c02adfd636a310 Reviewed-by: Oswald Buddenhagen --- mkspecs/win32-g++/qmake.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'mkspecs') diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 61963c7b0d..2b9eab3e3d 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -31,6 +31,7 @@ QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -Wextra QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -O2 -g QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections -- cgit v1.2.3