diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
| commit | 92c998afb66a2ec900d50cab57929c0a97ad46ac (patch) | |
| tree | 1f6219dc64c236c85d7365f8e07ee1df1f27a610 /mkspecs | |
| parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
| parent | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/declarative_debug.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf new file mode 100644 index 0000000000..b0248f0ac3 --- /dev/null +++ b/mkspecs/features/declarative_debug.prf @@ -0,0 +1 @@ +contains(QT, declarative):DEFINES += QT_DECLARATIVE_DEBUG diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index ebb94e272e..35a4d3f4a4 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -2,7 +2,7 @@ load(exclusive_builds) ### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG -exists($$_PRO_FILE_PWD_/sync.profile) { +!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { PRO_BASENAME = $$basename(_PRO_FILE_) # Try to detect proper QTDIR path. We require QTDIR, as syncqt uses that to create qt_module.pri @@ -31,7 +31,7 @@ exists($$_PRO_FILE_PWD_/sync.profile) { qtPrepareTool(QMAKE_SYNCQT, syncqt) - MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_) + MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$OUT_PWD $$_PRO_FILE_PWD_) !silent:message($$MSG) system($$MSG) { # success! Nothing to do diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 86d80cb239..13dadeb1e9 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -140,7 +140,7 @@ defineTest(qtAddModule) { } isEmpty(LINKAGE) { # Make sure we can link to uninstalled libraries - !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { + !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { QMAKE_LIBDIR *= $$MODULE_LIBS unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 8f225fe6ed..7b5b5ad304 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -186,6 +186,9 @@ DEFINES *= QT_USE_QSTRINGBUILDER TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +qtPrepareTool(QMAKE_MOC, moc) +qtPrepareTool(QMAKE_UIC, uic) +qtPrepareTool(QMAKE_RCC, rcc) qtPrepareTool(QMAKE_LUPDATE, lupdate) qtPrepareTool(QMAKE_LRELEASE, lrelease) |