diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-19 14:35:55 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-20 15:37:58 (GMT) |
| commit | b47c43e8774cf0126c53dd71dc8969dfeab84405 (patch) | |
| tree | 8fae213755a6c097cb22e9f3ec93f086bae568a5 /mkspecs | |
| parent | 64b989b1fc42a6f6d34e95cc52977e871f510321 (diff) | |
| download | Qt-b47c43e8774cf0126c53dd71dc8969dfeab84405.zip Qt-b47c43e8774cf0126c53dd71dc8969dfeab84405.tar.gz Qt-b47c43e8774cf0126c53dd71dc8969dfeab84405.tar.bz2 | |
don't assign MANIFEST_DIR if we don't need it
avoids warnings with qmake -Wall about overriding the variable (as
typically both scripts are in CONFIG, but only one is actually used).
Task-number: QTBUG-13911
Reviewed-by: mariusSO
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_dll.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/win32/embed_manifest_exe.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf index e8711da..69c9d1d 100644 --- a/mkspecs/features/win32/embed_manifest_dll.prf +++ b/mkspecs/features/win32/embed_manifest_dll.prf @@ -1,6 +1,6 @@ -MANIFEST_DIR = $$OBJECTS_DIR -isEmpty(MANIFEST_DIR):MANIFEST_DIR = . !if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") { + MANIFEST_DIR = $$OBJECTS_DIR + isEmpty(MANIFEST_DIR):MANIFEST_DIR = . NOPATH_TARGET = $$TARGET NOPATH_TARGET ~= s,\\\\ , ,q # Remove space escaping (NOPATH_TARGET is quoted) NOPATH_TARGET ~= s,\\\\,/,g # Change to single type separators diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf index 2d1c09b..44aadfa 100644 --- a/mkspecs/features/win32/embed_manifest_exe.prf +++ b/mkspecs/features/win32/embed_manifest_exe.prf @@ -1,6 +1,6 @@ -MANIFEST_DIR = $$OBJECTS_DIR -isEmpty(MANIFEST_DIR):MANIFEST_DIR = . if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") { + MANIFEST_DIR = $$OBJECTS_DIR + isEmpty(MANIFEST_DIR):MANIFEST_DIR = . NOPATH_TARGET = $$TARGET NOPATH_TARGET ~= s,\\\\ , ,q # Remove space escaping (NOPATH_TARGET is quoted) NOPATH_TARGET ~= s,\\\\,/,g # Change to single type separators |