From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 28 Feb 2012 16:12:32 +0000 (+0100)
Subject: dispose of BOOTSTRAPPING define
X-Git-Tag: qt-v5.0.0-alpha1~585^2^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c7aa37aa7d34860a9c062808416cef0118b36d6;p=profile%2Fivi%2Fqtbase.git

dispose of BOOTSTRAPPING define

this is used only in qmake, not in other bootstrapped tools

Change-Id: Ie2841e69dbd82c86d2297ddf51443ee75760766c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
---

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index ac99b80..ff1fd6b 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -46,11 +46,7 @@
 #include "qlibraryinfo.h"
 #include "qscopedpointer.h"
 
-#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED)
-# define BOOTSTRAPPING
-#endif
-
-#ifdef BOOTSTRAPPING
+#ifdef QT_BUILD_QMAKE
 QT_BEGIN_NAMESPACE
 extern QString qmake_libraryInfoFile();
 QT_END_NAMESPACE
@@ -97,7 +93,7 @@ public:
 QLibrarySettings::QLibrarySettings()
     : settings(QLibraryInfoPrivate::findConfiguration())
 {
-#ifndef BOOTSTRAPPING
+#ifndef QT_BUILD_QMAKE
     qAddPostRoutine(QLibraryInfoPrivate::cleanup);
 #endif
 }
@@ -105,7 +101,7 @@ QLibrarySettings::QLibrarySettings()
 QSettings *QLibraryInfoPrivate::findConfiguration()
 {
     QString qtconfig = QLatin1String(":/qt/etc/qt.conf");
-#ifdef BOOTSTRAPPING
+#ifdef QT_BUILD_QMAKE
     if(!QFile::exists(qtconfig))
         qtconfig = qmake_libraryInfoFile();
 #else
@@ -286,7 +282,7 @@ QLibraryInfo::location(LibraryLocation loc)
         QString baseDir;
         if (loc == PrefixPath) {
             // we make the prefix path absolute to the executable's directory
-#ifdef BOOTSTRAPPING
+#ifdef QT_BUILD_QMAKE
             baseDir = QFileInfo(qmake_libraryInfoFile()).absolutePath();
 #else
             if (QCoreApplication::instance()) {