From 9ab41425519510b5bfbe93ac916e3f40aa0e4510 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Apr 2014 14:11:49 +0200 Subject: centralize auxiliary lib creation this covers convenience libraries which are linked into dlls (if we are not building statically) and "proper" (installed) builds of 3rdparty code. Change-Id: I2f00248c0baa0e73346e477724bf49bbc62ba925 Reviewed-by: Konstantin Ritt Reviewed-by: Laszlo Agocs Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_helper_lib.prf | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 mkspecs/features/qt_helper_lib.prf (limited to 'mkspecs') diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf new file mode 100644 index 0000000000..cb7bc2c8a8 --- /dev/null +++ b/mkspecs/features/qt_helper_lib.prf @@ -0,0 +1,25 @@ +# +# W A R N I N G +# ------------- +# +# This file is not part of the Qt API. It exists purely as an +# implementation detail. It may change from version to version +# without notice, or even be removed. +# +# We mean it. +# + +load(qt_build_paths) + +TEMPLATE = lib +CONFIG -= qt + +contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release +contains(QT_CONFIG, build_all): CONFIG += build_all + +DESTDIR = $$MODULE_BASE_OUTDIR/lib +DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin + +installed: load(qt_installs) + +TARGET = $$qtLibraryTarget($$TARGET) -- cgit v1.2.3 From bd804329f5438b3a9d248d0ad58a69dcbc45c4a3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Apr 2014 15:31:07 +0200 Subject: install convenience libraries when building statically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit we don't link static libs into other static libs, so the intermediate libs need to be installed and resolved at app link time. Task-number: QTBUG-32519 Change-Id: I0558140f98a6938b03306df7f800d66f8a19a7cd Reviewed-by: Tor Arne Vestbø Reviewed-by: Friedemann Kleint Reviewed-by: Jeremy Lainé Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_helper_lib.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index cb7bc2c8a8..4af5bcaabb 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -20,6 +20,8 @@ contains(QT_CONFIG, build_all): CONFIG += build_all DESTDIR = $$MODULE_BASE_OUTDIR/lib DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin -installed: load(qt_installs) +# Static builds always need to be installed, as the convenience libraries +# are not linked to the final library in this case. +installed|static: load(qt_installs) TARGET = $$qtLibraryTarget($$TARGET) -- cgit v1.2.3 From 2c0c4676e36ee28a79345ad626fe0bdc6e8c970a Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 29 Apr 2014 14:21:46 +0200 Subject: mkspec (iOS): use QTPLUGIN.platforms=- After bbcdccd, a deprecation warning is written to the console every time you run qmake on iOS. This change will make use of the new QTPLUGIN.platforms=- instead if the deprecated CONFIG -= import_qpa_plugin Change-Id: I51e4f9d18f6abd87512a39b3236b89d5444fd6c1 Reviewed-by: Oswald Buddenhagen --- mkspecs/macx-ios-clang/features/qt.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf index 04ebb1208a..a5b00377ee 100644 --- a/mkspecs/macx-ios-clang/features/qt.prf +++ b/mkspecs/macx-ios-clang/features/qt.prf @@ -15,7 +15,7 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { # We do link and dependency resolution for the platform plugin # manually, since we know we always need the plugin, so we don't # need to generate an import for it. - CONFIG -= import_qpa_plugin + QTPLUGIN.platforms = - !no_main_wrapper { # We use ld to rename the _main symbol to _qt_main, so that we don't get a symbol clash -- cgit v1.2.3 From 3b00cc480400d47c59c29d3507c7fcdc9be2a489 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 24 Apr 2014 14:53:45 -0700 Subject: Use the "gcc" feature in simd.prf Matches the compiler capabilities better and will catch all GCC-like compilers (including Clang, LLVM and Intel CC on Unix). Task-number: QTBUG-38544 Change-Id: I102966d307a4e167b6dcf3da08359e656f3af45e Reviewed-by: Oswald Buddenhagen --- mkspecs/features/simd.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index 4f86f60700..62a63f90ca 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) # # Set up compilers for SIMD (SSE/AVX, NEON etc) # -*-g++*|intel_icc|*-clang*|*-qcc* { +gcc { # includes intel_icc and clang variants sse2 { HEADERS += $$SSE2_HEADERS -- cgit v1.2.3