diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
tree | 2b89637b93fc7d81c674106008566010f986d67c /mkspecs/features | |
parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/create_cmake.prf | 12 | ||||
-rw-r--r-- | mkspecs/features/declarative_debug.prf | 1 | ||||
-rw-r--r-- | mkspecs/features/device_config.prf | 11 | ||||
-rw-r--r-- | mkspecs/features/qml_debug.prf | 1 | ||||
-rw-r--r-- | mkspecs/features/qt_module_config.prf | 2 |
5 files changed, 18 insertions, 9 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 6a8045ab3b..b8809a236b 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -17,10 +17,6 @@ defineReplace(cmakeModuleList) { CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) -CMAKE_MODULE_DEPS = $$cmakeModuleList($$eval(QT.$${MODULE}.depends)) -CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5::") -!isEmpty(CMAKE_PARTIAL_MODULE_DEPS):CMAKE_QT5_MODULE_DEPS = "Qt5::$${CMAKE_PARTIAL_MODULE_DEPS}" - CMAKE_QT_INSTALL_PREFIX = $$replace($$list($$[QT_INSTALL_PREFIX]), \\\\, /)/ CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$CMAKE_QT_INSTALL_PREFIX)" @@ -114,11 +110,11 @@ macx { } } -debug_type = -release_type = +CMAKE_DEBUG_TYPE = +CMAKE_RELEASE_TYPE = -debug_and_release|debug:debug_type = debug -debug_and_release|release:release_type = release +debug_and_release|debug:CMAKE_DEBUG_TYPE = debug +debug_and_release|release:CMAKE_RELEASE_TYPE = release INSTALLS += cmake_qt5_module_files diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf index 59e45f662f..9125fcf33f 100644 --- a/mkspecs/features/declarative_debug.prf +++ b/mkspecs/features/declarative_debug.prf @@ -1 +1,2 @@ DEFINES += QT_DECLARATIVE_DEBUG +warning("CONFIG+=declarative_debug is deprecated. Use qml_debug instead!") diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 56059e13cf..90bf9150e9 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -25,3 +25,14 @@ exists($$DEVICE_PRI):include($$DEVICE_PRI) unset(DEVICE_PRI) unset(DIR) +# Provide a function to be used by mkspecs +defineTest(deviceSanityCheckCompiler) { + # Check if the binary exists, e.g. with an absolute path + exists($$QMAKE_CXX):return() + + # Check if the compiler is in the path + system("which $$QMAKE_CXX > /dev/null"):return() + + error("Compiler $$QMAKE_CXX not found") +} + diff --git a/mkspecs/features/qml_debug.prf b/mkspecs/features/qml_debug.prf new file mode 100644 index 0000000000..72f4f2202a --- /dev/null +++ b/mkspecs/features/qml_debug.prf @@ -0,0 +1 @@ +DEFINES += QT_QML_DEBUG diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 75156a1f44..ac0b635f2f 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -42,7 +42,7 @@ CONFIG -= fix_output_dirs win32|mac:!macx-xcode:CONFIG += debug_and_release linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -!isEmpty(MODULE):CONFIG += create_cmake +!isEmpty(DESTDIR):CONFIG += create_cmake contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions |