From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Tue, 24 Jul 2012 07:21:16 +0000 (+0200)
Subject: Don't make the CMake file generation dependent on DESTDIR.
X-Git-Tag: v5.0.0-beta1~631
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5b029049771df1bdb01d5d8cf7e9e4bc964060f;p=profile%2Fivi%2Fqtbase.git

Don't make the CMake file generation dependent on DESTDIR.

It is expected to be well defined for the CMake files to be generated
correctly, but if that stops being the case, it should fail loudly. All
of the generated CMake packages are CI tested.

Change-Id: I67c7fa6ef1fe0a019c40936cb12db282669e9ee8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 8786f77..c4dfb19 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -129,7 +129,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 QT += $$QT_PRIVATE
 unset(QT_PRIVATE)
 
-!build_pass:!internal_module:!isEmpty(DESTDIR):CONFIG += create_cmake
+!build_pass:!internal_module:CONFIG += create_cmake
 
 contains(TARGET, QtAddOn.*): \
     DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB