From 9dcc3a57282f60e2394a2a54fc0a735a4240c5c8 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Sep 2014 09:36:28 -0700 Subject: create_cmake: Fix mingw plugin path MinGW static libs use libfoo.a format, and not foo.lib. Change-Id: I899adca8ec0b1c8430f5b6c4f18ad0ea1dc6d398 Reviewed-by: Timothy Gu Reviewed-by: Oswald Buddenhagen --- mkspecs/features/create_cmake.prf | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 2533b7b8d6..e8749579ff 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -133,11 +133,16 @@ contains(CONFIG, plugin) { CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME win32 { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dll - else: CMAKE_PlUGIN_EXT = .lib - - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}$${CMAKE_PlUGIN_EXT} - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d$${CMAKE_PlUGIN_EXT} + isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll + } else:mingw { + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a + } else { # MSVC static + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib + } } else { mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib -- cgit v1.2.3 From aedfb7e9826146f954d7c029c55bbea7dc0d350b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 30 Sep 2014 11:04:31 +0200 Subject: actually use DIRLIST_SEPARATOR it's QMAKE_DIRLIST_SEP and DIRLIST_SEPARATOR. pure evil. Task-number: QTBUG-41668 Change-Id: Ie2f6db6530e0f50bc1ce5db593180e7ad703766b Reviewed-by: Joerg Bornemann Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/features/java.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 1c55b8974e..1b9754da8a 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -30,7 +30,7 @@ CONFIG += plugin no_plugin_name_prefix javac.input = JAVASOURCES javac.output = $$CLASS_DIR javac.CONFIG += combine -javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEP))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} +javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} # Force rebuild every time, because we don't know the paths of the destination files # as they depend on the code. javac.depends = FORCE -- cgit v1.2.3 From 10bd8e2104331e26ead4d3e43a41f997693fd494 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 30 Oct 2013 16:20:35 +0100 Subject: Don't make Info.plist for debug framework bundles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do so by setting a 'no_plist' config property. Can be overridden with 'force_debug_plist'. The debug version of Info.plist would overwrite the release version, and it also happens to contain invalid data. In particular, CFBundleExecutable would contain the _debug suffixed libname, which it shouldn't. See the entry about CFBundleExecutable on https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Task-number: QTBUG-32894 Change-Id: Ideb018e4768a7c4e276e1b07d77937451f6db6a2 Reviewed-by: Morten Johan Sørvig --- mkspecs/features/resolve_config.prf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf index 7835fe4f7c..b712a2b58e 100644 --- a/mkspecs/features/resolve_config.prf +++ b/mkspecs/features/resolve_config.prf @@ -25,10 +25,13 @@ CONFIG(static, static|shared) { !macx-xcode: \ addExclusiveBuilds(shared, static) -CONFIG(debug, debug|release): \ +CONFIG(debug, debug|release) { CONFIG -= release -else: \ + !force_debug_plist:debug_and_release: \ + CONFIG += no_plist +} else { CONFIG -= debug +} !macx-xcode { addExclusiveBuilds(debug, release) -- cgit v1.2.3 From d6444b2e56927f664635980ba0599cef43fa2d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 22 Sep 2014 11:24:13 +0200 Subject: Add CFBundleVersion to the Info.plist files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add @FULL_VERSION@ -> Qt version substitution to unixmake2. This makes the Qt-generated Info.plist files compliant with the bundle signing/validation process. Task-number: QTBUG-32896 Change-Id: I1818f028c2f740d699629dd78cc0fe6ffaf94a1c Reviewed-by: Jake Petroules Reviewed-by: Morten Johan Sørvig --- mkspecs/macx-clang-32/Info.plist.lib | 2 ++ mkspecs/macx-clang/Info.plist.lib | 2 ++ mkspecs/macx-g++-32/Info.plist.lib | 2 ++ mkspecs/macx-g++/Info.plist.lib | 2 ++ mkspecs/macx-g++40/Info.plist.lib | 2 ++ mkspecs/macx-g++42/Info.plist.lib | 2 ++ mkspecs/macx-icc/Info.plist.lib | 2 ++ mkspecs/macx-ios-clang/Info.plist.lib | 2 ++ mkspecs/macx-llvm/Info.plist.lib | 2 ++ 9 files changed, 18 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/macx-clang-32/Info.plist.lib b/mkspecs/macx-clang-32/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-clang-32/Info.plist.lib +++ b/mkspecs/macx-clang-32/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-g++-32/Info.plist.lib b/mkspecs/macx-g++-32/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-g++-32/Info.plist.lib +++ b/mkspecs/macx-g++-32/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-g++40/Info.plist.lib b/mkspecs/macx-g++40/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-g++40/Info.plist.lib +++ b/mkspecs/macx-g++40/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-g++42/Info.plist.lib b/mkspecs/macx-g++42/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-g++42/Info.plist.lib +++ b/mkspecs/macx-g++42/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-icc/Info.plist.lib b/mkspecs/macx-icc/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-icc/Info.plist.lib +++ b/mkspecs/macx-icc/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-ios-clang/Info.plist.lib +++ b/mkspecs/macx-ios-clang/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature diff --git a/mkspecs/macx-llvm/Info.plist.lib b/mkspecs/macx-llvm/Info.plist.lib index 63f1a945c2..2a44d1721e 100644 --- a/mkspecs/macx-llvm/Info.plist.lib +++ b/mkspecs/macx-llvm/Info.plist.lib @@ -6,6 +6,8 @@ FMWK CFBundleShortVersionString @SHORT_VERSION@ + CFBundleVersion + @FULL_VERSION@ CFBundleGetInfoString Created by Qt/QMake CFBundleSignature -- cgit v1.2.3 From f72dcff925deeacaef0b5252ac52097ddedd11c1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Sep 2014 13:22:05 +0200 Subject: fix parallel installation of private and qpa headers in qt framework bundles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with qmake now de-duplicating the paths properly, we should version these QMAKE_BUNDLE_DATA entries as well, so we don't depend on the symlinking of the regular headers being done first. Change-Id: Idaa2ccc1ba9b5684b0c8d84f7f760735f54432e1 Reviewed-by: Morten Johan Sørvig --- mkspecs/features/qt_module.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 8bf4c92cdd..4352ae0a0b 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -101,8 +101,10 @@ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { FRAMEWORK_HEADERS.version = Versions FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES FRAMEWORK_HEADERS.path = Headers + FRAMEWORK_PRIVATE_HEADERS.version = Versions FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/private + FRAMEWORK_QPA_HEADERS.version = Versions FRAMEWORK_QPA_HEADERS.files = $$SYNCQT.QPA_HEADER_FILES FRAMEWORK_QPA_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/qpa QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS FRAMEWORK_PRIVATE_HEADERS FRAMEWORK_QPA_HEADERS -- cgit v1.2.3