From 37ab8b4ed744f403d6c958284a9108dd1979b7f1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 23 Jul 2013 11:32:32 +0200 Subject: CMake: Remove copy-pasto for the IMPORTED_LOCATION Task-number: QTBUG-32579 Change-Id: Ibe9dd92824091989168fca842a59b556937b1f08 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index bcff3166d3..478d1d13d5 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -49,7 +49,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ELSE - set(imported_location \"IMPORTED_LOCATION_${Configuration}\" \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- cgit v1.2.3 From 27313d12449cf9e84ca1e3ebb723c23a889edc18 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 23 Jul 2013 09:43:15 +0200 Subject: CMake: Add a clean_path before returning a path. The $$path may already be absolute, so prepending a slash may result in //usr/lib, for example. Task-number: QTBUG-32570 Change-Id: If7a4f6fbec0216404cfe48c1da62d21d75b3e272 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- mkspecs/features/cmake_functions.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf index 2dc72a7a2f..fac73b464c 100644 --- a/mkspecs/features/cmake_functions.prf +++ b/mkspecs/features/cmake_functions.prf @@ -29,7 +29,7 @@ defineReplace(cmakeTargetPath) { SYSR = $$[QT_SYSROOT] !isEmpty(SYSR): path = $$relative_path($$1, $$[QT_SYSROOT]) else: path = $$1 - return(/$$path) + return($$clean_path(/$$path)) } defineReplace(cmakeTargetPaths) { -- cgit v1.2.3 From 9b7adfa081b5ded58b682b88ef8f378a5ff53a18 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 23 Jul 2013 10:23:08 +0200 Subject: Move the cmakeRelativePath function to cmake_functions. Task-number: QTBUG-32570 Change-Id: I05bbf7084ef8501bf17698f2ecc1cf3d8fd4d460 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- mkspecs/features/cmake_functions.prf | 5 +++++ mkspecs/features/create_cmake.prf | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf index fac73b464c..a9b0c86cad 100644 --- a/mkspecs/features/cmake_functions.prf +++ b/mkspecs/features/cmake_functions.prf @@ -63,3 +63,8 @@ defineReplace(cmakeProcessLibs) { } return ($$join(out, ";")) } + +defineReplace(cmakeRelativePath) { + path = $$relative_path($$1, $$2) + return($$replace(path, ([^/])$, \\1/)) +} diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 7a200056ae..58a0620e01 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -11,11 +11,6 @@ load(cmake_functions) -defineReplace(cmakeRelativePath) { - path = $$relative_path($$1, $$2) - return($$replace(path, ([^/])$, \\1/)) -} - CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) CMAKE_MODULE_DEPS = $$cmakeModuleList($$sort_depends(QT.$${MODULE}.depends, QT.)) -- cgit v1.2.3 From 880f73d1f0382d4ac91f54f47e1c6be0b760c393 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 23 Jul 2013 10:23:47 +0200 Subject: Use absolute path in the /usr move workaround if -libdir is specified Change-Id: I68d087b15839418008db5bf1c0c76ca303245519 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 478d1d13d5..c4b58fe7d7 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -4,6 +4,9 @@ if (CMAKE_VERSION VERSION_LESS 2.8.3) endif() !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +!!ELSE get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) # Use original install prefix when loaded through a # cross-prefix symbolic link such as /lib -> /usr/lib. @@ -17,6 +20,7 @@ endif() unset(_realOrig) unset(_realCurr) unset(_IMPORT_PREFIX) +!!ENDIF !!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) !!ELSE -- cgit v1.2.3 From f2a611ce6cb0f86d9331641a804de6a507900db7 Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Thu, 18 Jul 2013 20:45:47 +0000 Subject: Fixed mkspecs/devices/linux_device_post.conf for non-arm platforms. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now arm specific -mfloat-abi flag is added to compiler flags only for arm architecture in linux_arm_device_post.conf. Change-Id: Ie77ac6e0717d9d1fd9c14e1d6a26e86f08ab418c Reviewed-by: Jarosław Staniek Reviewed-by: Oswald Buddenhagen --- mkspecs/devices/common/linux_arm_device_post.conf | 7 +++++++ mkspecs/devices/common/linux_device_post.conf | 6 ------ mkspecs/devices/linux-imx53qsb-g++/qmake.conf | 2 +- mkspecs/devices/linux-imx6-g++/qmake.conf | 2 +- mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 2 +- mkspecs/devices/linux-tegra2-g++/qmake.conf | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 mkspecs/devices/common/linux_arm_device_post.conf (limited to 'mkspecs') diff --git a/mkspecs/devices/common/linux_arm_device_post.conf b/mkspecs/devices/common/linux_arm_device_post.conf new file mode 100644 index 0000000000..7ce47592a9 --- /dev/null +++ b/mkspecs/devices/common/linux_arm_device_post.conf @@ -0,0 +1,7 @@ +contains(DISTRO_OPTS, hard-float) { + COMPILER_FLAGS += -mfloat-abi=hard +} else { + COMPILER_FLAGS += -mfloat-abi=softfp +} + +include(linux_device_post.conf) diff --git a/mkspecs/devices/common/linux_device_post.conf b/mkspecs/devices/common/linux_device_post.conf index f8dbf762d8..548e75affa 100644 --- a/mkspecs/devices/common/linux_device_post.conf +++ b/mkspecs/devices/common/linux_device_post.conf @@ -3,12 +3,6 @@ contains(DISTRO_OPTS, deb-multi-arch) { -Wl,-rpath-link,$$[QT_SYSROOT]/lib/$${GCC_MACHINE_DUMP} } -contains(DISTRO_OPTS, hard-float) { - COMPILER_FLAGS += -mfloat-abi=hard -} else { - COMPILER_FLAGS += -mfloat-abi=softfp -} - QMAKE_CFLAGS += $$COMPILER_FLAGS QMAKE_CXXFLAGS += $$COMPILER_FLAGS diff --git a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf index 0a5ed89feb..3a9766c4cb 100644 --- a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf +++ b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf @@ -32,6 +32,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE QMAKE_CFLAGS_DEBUG += $$IMX5_CFLAGS QMAKE_CXXFLAGS_DEBUG += $$IMX5_CFLAGS -include(../common/linux_device_post.conf) +include(../common/linux_arm_device_post.conf) load(qt_config) diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 20f6d115bf..2b8dbf6b67 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -34,6 +34,6 @@ QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE QMAKE_CFLAGS_DEBUG += $$IMX6_CFLAGS QMAKE_CXXFLAGS_DEBUG += $$IMX6_CFLAGS -include(../common/linux_device_post.conf) +include(../common/linux_arm_device_post.conf) load(qt_config) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index d6fea474a6..5f923ad5c6 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -42,6 +42,6 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host -include(../common/linux_device_post.conf) +include(../common/linux_arm_device_post.conf) load(qt_config) diff --git a/mkspecs/devices/linux-tegra2-g++/qmake.conf b/mkspecs/devices/linux-tegra2-g++/qmake.conf index 1c7a8cc52a..320e1b8a21 100644 --- a/mkspecs/devices/linux-tegra2-g++/qmake.conf +++ b/mkspecs/devices/linux-tegra2-g++/qmake.conf @@ -26,6 +26,6 @@ TEGRA2_CFLAGS = -mtune=cortex-a9 -march=armv7-a -mhard-float -mfloat-a QMAKE_CFLAGS += $$TEGRA2_CFLAGS QMAKE_CXXFLAGS += $$TEGRA2_CFLAGS -include(../common/linux_device_post.conf) +include(../common/linux_arm_device_post.conf) load(qt_config) -- cgit v1.2.3 From 5d51634b4e42892841e10e47d081e10cfd8d3446 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 26 Jul 2013 10:50:34 +0200 Subject: Android: Add QT_NO_PRINTER to DEFINES Printing is not enabled for Android. Change-Id: I5f589a036355fd63a7616fd57eeba1354d91281b Reviewed-by: Paul Olav Tvete --- mkspecs/android-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 95fa8a9786..48b8e2119a 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -4,7 +4,7 @@ QMAKE_PLATFORM = android QMAKE_COMPILER = gcc CONFIG += android_install -DEFINES += QT_NO_PRINTDIALOG +DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG include(../common/linux.conf) include(../common/gcc-base-unix.conf) -- cgit v1.2.3 From e440b35bb34023998f62fd426987c23bd5983f46 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 31 Jul 2013 10:37:31 -0400 Subject: Update Info.plist templates to use the current standard plist format. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the version number to 1.0, and use the public doctype. Change-Id: I9b071c80c410c31c38813c4447edd7b186226fab Reviewed-by: Jake Petroules Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-clang-32/Info.plist.app | 4 ++-- mkspecs/macx-clang-32/Info.plist.lib | 10 +++++----- mkspecs/macx-clang/Info.plist.app | 4 ++-- mkspecs/macx-clang/Info.plist.lib | 10 +++++----- mkspecs/macx-g++-32/Info.plist.app | 4 ++-- mkspecs/macx-g++-32/Info.plist.lib | 10 +++++----- mkspecs/macx-g++/Info.plist.app | 4 ++-- mkspecs/macx-g++/Info.plist.lib | 10 +++++----- mkspecs/macx-g++40/Info.plist.app | 4 ++-- mkspecs/macx-g++40/Info.plist.lib | 10 +++++----- mkspecs/macx-g++42/Info.plist.app | 4 ++-- mkspecs/macx-g++42/Info.plist.lib | 10 +++++----- mkspecs/macx-llvm/Info.plist.app | 4 ++-- mkspecs/macx-llvm/Info.plist.lib | 10 +++++----- mkspecs/macx-xcode/Info.plist.app | 4 ++-- mkspecs/macx-xcode/Info.plist.lib | 10 +++++----- mkspecs/unsupported/macx-ios-clang/Info.plist.app | 4 ++-- mkspecs/unsupported/macx-ios-clang/Info.plist.lib | 10 +++++----- 18 files changed, 63 insertions(+), 63 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/macx-clang-32/Info.plist.app b/mkspecs/macx-clang-32/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-clang-32/Info.plist.app +++ b/mkspecs/macx-clang-32/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-clang-32/Info.plist.lib b/mkspecs/macx-clang-32/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-clang-32/Info.plist.lib +++ b/mkspecs/macx-clang-32/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-clang/Info.plist.app +++ b/mkspecs/macx-clang/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++-32/Info.plist.app b/mkspecs/macx-g++-32/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++-32/Info.plist.app +++ b/mkspecs/macx-g++-32/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++-32/Info.plist.lib b/mkspecs/macx-g++-32/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++-32/Info.plist.lib +++ b/mkspecs/macx-g++-32/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++40/Info.plist.app b/mkspecs/macx-g++40/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++40/Info.plist.app +++ b/mkspecs/macx-g++40/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++40/Info.plist.lib b/mkspecs/macx-g++40/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++40/Info.plist.lib +++ b/mkspecs/macx-g++40/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-g++42/Info.plist.app b/mkspecs/macx-g++42/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-g++42/Info.plist.app +++ b/mkspecs/macx-g++42/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-g++42/Info.plist.lib b/mkspecs/macx-g++42/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-g++42/Info.plist.lib +++ b/mkspecs/macx-g++42/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-llvm/Info.plist.app b/mkspecs/macx-llvm/Info.plist.app index b822c2851f..187a8e0aa4 100644 --- a/mkspecs/macx-llvm/Info.plist.app +++ b/mkspecs/macx-llvm/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-llvm/Info.plist.lib b/mkspecs/macx-llvm/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-llvm/Info.plist.lib +++ b/mkspecs/macx-llvm/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/macx-xcode/Info.plist.app b/mkspecs/macx-xcode/Info.plist.app index b822c2851f..187a8e0aa4 100755 --- a/mkspecs/macx-xcode/Info.plist.app +++ b/mkspecs/macx-xcode/Info.plist.app @@ -1,6 +1,6 @@ - - + + NSPrincipalClass NSApplication diff --git a/mkspecs/macx-xcode/Info.plist.lib b/mkspecs/macx-xcode/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/macx-xcode/Info.plist.lib +++ b/mkspecs/macx-xcode/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.app b/mkspecs/unsupported/macx-ios-clang/Info.plist.app index c7d660b8d1..91f4b3d07e 100755 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.app +++ b/mkspecs/unsupported/macx-ios-clang/Info.plist.app @@ -1,6 +1,6 @@ - - + + CFBundleIconFile @ICON@ diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib b/mkspecs/unsupported/macx-ios-clang/Info.plist.lib index 97609ed0ce..63f1a945c2 100644 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib +++ b/mkspecs/unsupported/macx-ios-clang/Info.plist.lib @@ -1,12 +1,12 @@ - - + + CFBundlePackageType FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString Created by Qt/QMake CFBundleSignature @TYPEINFO@ -- cgit v1.2.3 From 9370f50f2ce809647862f0b65ea0aa82e96556bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 29 Jul 2013 14:32:36 +0200 Subject: Add Info.plist templates for the macx-icc makespec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-31355 Change-Id: Iea2ac2a072bbd2c0104f0704a86503c0982fb886 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jake Petroules Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-icc/Info.plist.app | 22 ++++++++++++++++++++++ mkspecs/macx-icc/Info.plist.lib | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 mkspecs/macx-icc/Info.plist.app create mode 100644 mkspecs/macx-icc/Info.plist.lib (limited to 'mkspecs') diff --git a/mkspecs/macx-icc/Info.plist.app b/mkspecs/macx-icc/Info.plist.app new file mode 100644 index 0000000000..187a8e0aa4 --- /dev/null +++ b/mkspecs/macx-icc/Info.plist.app @@ -0,0 +1,22 @@ + + + + + NSPrincipalClass + NSApplication + CFBundleIconFile + @ICON@ + CFBundlePackageType + APPL + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + @TYPEINFO@ + CFBundleExecutable + @EXECUTABLE@ + CFBundleIdentifier + com.yourcompany.@EXECUTABLE@ + NOTE + This file was generated by Qt/QMake. + + diff --git a/mkspecs/macx-icc/Info.plist.lib b/mkspecs/macx-icc/Info.plist.lib new file mode 100644 index 0000000000..63f1a945c2 --- /dev/null +++ b/mkspecs/macx-icc/Info.plist.lib @@ -0,0 +1,18 @@ + + + + + CFBundlePackageType + FMWK + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + @TYPEINFO@ + CFBundleExecutable + @LIBRARY@ + NOTE + Please, do NOT change this file -- It was generated by Qt/QMake. + + -- cgit v1.2.3 From c84114acee48a05e2445e7b487ef43e9861ddd95 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 2 Aug 2013 10:14:01 +0200 Subject: Android: Fix crash when compiling release mode for armv5 When building in thumb mode for armv5 applications will crash with SIGILL on startup. This has been observed on armv7 devices and emulators. It could be a bug in the gcc 4.4.3 toolchain, but since the other toolchains in the NDK have other bugs that make it impossible to use them for building, we need to disable thumb until the cross-compiler has been fixed. Task-number: QTBUG-31338 Change-Id: I22dd228158ef8c43b0b1d6e549d5725c1930536b Reviewed-by: Thiago Macieira Reviewed-by: Paul Olav Tvete --- mkspecs/android-g++/qmake.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 48b8e2119a..bcdfe06897 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -109,8 +109,12 @@ equals(ANDROID_TARGET_ARCH, x86) { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -O2 QMAKE_CFLAGS_DEBUG = -g -fno-omit-frame-pointer } else { # arm - QMAKE_CFLAGS_RELEASE = -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 + QMAKE_CFLAGS_RELEASE = -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -g -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 + equals(ANDROID_TARGET_ARCH, armeabi-v7a) { + QMAKE_CFLAGS_RELEASE += -mthumb + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb + } QMAKE_CFLAGS_DEBUG = -g -marm -O0 -fno-omit-frame-pointer } -- cgit v1.2.3 From faea8d1056e4b034404febd0ef44a00e7784018d Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 11 Aug 2013 15:08:48 +0300 Subject: gdb_dwarf_index: Use a sed call that's more POSIX-compliant. sed versions other than the GNU one often default to being POSIX-compliant, in which case "+" (with and without escaping) is always an ordinary character. Achieve the same functionality in a way that works with both GNU and BSD seds by using "xx*" insted of "x\+". Change-Id: I1d2576a8c0e17b31f01a44d9632c57991e53780d Reviewed-by: Oswald Buddenhagen --- mkspecs/features/unix/gdb_dwarf_index.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 0a5ee507ff..2b3dee6cc4 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -9,7 +9,7 @@ } QMAKE_GDB_INDEX += \ - test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ + test \$\$(gdb --version | sed -e \'s,[^0-9][^0-9]*\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -ex quit \'$(TARGET)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ -- cgit v1.2.3 From 1dcdc506f34bfa0d9adc6d07587a4a71dbda455b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 22 Jul 2013 13:09:21 +0200 Subject: Fix SONAME handling on android Set the SONAME to the library name without the major version number appended, as android does not have the versioned symlinks. Change-Id: I41c504869019a393a3f112b2f7fc81c7ad5afa1c Reviewed-by: Oswald Buddenhagen Reviewed-by: BogDan Vatra --- mkspecs/android-g++/qmake.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index bcdfe06897..0afea12e60 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -3,7 +3,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = android QMAKE_COMPILER = gcc -CONFIG += android_install +CONFIG += android_install unversioned_soname DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG include(../common/linux.conf) @@ -177,7 +177,6 @@ contains(NDK_ROOT, ".*r6")|contains(NDK_ROOT, ".*r5.*") { } QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined QMAKE_LFLAGS_RPATH = -Wl,-rpath= QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link= -- cgit v1.2.3