diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-01-06 13:01:22 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-01-06 13:47:40 +0000 |
| commit | 6060ffff88fd4345aa5e89b6e3d761704379ad4e (patch) | |
| tree | 9500b260b109cc78a2993ecad32abe7176f4cf3b | |
| parent | 6e823d283286aab15592f9fde11720c10447c4c5 (diff) | |
Fixed recently added "excess colon in front of brace" qmake warning
Change-Id: I3a650bb4e27cad00f639e6445c36fa8b69edb5b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/android/android.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/win32/idcidl.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/win32/windows.prf | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index f428f7db87..7d77598e76 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -3,7 +3,7 @@ contains(TEMPLATE, ".*app") { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so QMAKE_LFLAGS += -Wl,-soname,$$shell_quote($$TARGET) - android_install: { + android_install { target.path=/libs/$$ANDROID_TARGET_ARCH/ INSTALLS *= target } diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index c3448718b9..72632a14ee 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -208,7 +208,7 @@ contains(qt_module_deps, qml): \ !isEmpty(IMPORTS._KEYS_) { # add import plugins to LIBS line - for (key, IMPORTS._KEYS_): { + for (key, IMPORTS._KEYS_) { PATH = $$eval(IMPORTS.$${key}.path) PLUGIN = $$eval(IMPORTS.$${key}.plugin) !isEmpty(PATH):!isEmpty(PLUGIN): LIBS *= -L$$PATH -l$${PLUGIN}$$qtPlatformTargetSuffix() @@ -347,7 +347,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { QT_LINKAGE = -l$${QTPLUG}$$qtPlatformTargetSuffix() # Only link against plugin in static builds - isEqual(QT_CURRENT_VERIFY, QTPLUGIN): { + isEqual(QT_CURRENT_VERIFY, QTPLUGIN) { !isEmpty(QT_PLUGINPATH) { plugpath = $$eval(QT_PLUGIN.$${QTPLUG}.PATH) isEmpty(plugpath): \ diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf index a688b3ff41..fba7173e79 100644 --- a/mkspecs/features/win32/idcidl.prf +++ b/mkspecs/features/win32/idcidl.prf @@ -1,4 +1,4 @@ -build_pass:console: { +build_pass:console { warning("QAxServer applications cannot be console applications.") warning("Remove 'console' from your CONFIG.") } diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 6ea9756f9a..986067fc8c 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") { mingw:DEFINES += QT_NEEDS_QMAIN qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain): { + isEqual(entryLib, -lqtmain) { !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d |