projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5863103)
set DLLDESTDIR only for non-prefix builds
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 3 Jul 2012 15:41:43 +0000 (17:41 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 5 Jul 2012 19:10:52 +0000 (21:10 +0200)
a prefix build needs to be installed first anyway

Change-Id: I798861fddad2be289e9e4f182d0373e389b57437
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
mkspecs/features/qt_module_config.prf patch | blob | history

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 7dab4f4..67db209 100644 (file)
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -113,7 +113,7 @@ load(qt_module_headers)
 #other
 TEMPLATE         = lib
 DESTDIR          = $$eval(QT.$${MODULE}.libs)
-win32:!wince*: DLLDESTDIR = $$eval(QT.$${MODULE}.bins)
+win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT.$${MODULE}.bins)
 
 CONFIG          += qt warn_on depend_includepath
 CONFIG          += qmake_cache target_qt
Domain: UI Framework / Uncategorized;