diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 15:22:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 17:25:23 +0200 |
commit | 074a5ce50e10785bd7c10d9b3120905b9042f9e0 (patch) | |
tree | 2b018e308fa619f677035cb06f4aa37eff04d110 | |
parent | 0b2d55390c20d70c4bfac1fa4ec3f580be0b907e (diff) |
don't require (dummy) qconfig.h for qmake build
Change-Id: I22a2c9aa1366ff858b3bb646617543968c810136
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rwxr-xr-x | configure | 25 | ||||
-rw-r--r-- | src/corelib/global/qglobal.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 1 |
3 files changed, 2 insertions, 26 deletions
@@ -3557,25 +3557,6 @@ setBootstrapVariable() if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake. Please wait..." - OLD_QCONFIG_H= - QCONFIG_H="$outpath/src/corelib/global/qconfig.h" - QMAKE_QCONFIG_H="${QCONFIG_H}.qmake" - if [ -f "$QCONFIG_H" ]; then - OLD_QCONFIG_H=$QCONFIG_H - mv -f "$OLD_QCONFIG_H" "${OLD_QCONFIG_H}.old" - fi - - # create temporary qconfig.h for compiling qmake, if it doesn't exist - # when building qmake, we use #defines for the install paths, - # however they are real functions in the library - if [ '!' -f "$QMAKE_QCONFIG_H" ]; then - mkdir -p "$outpath/src/corelib/global" - [ -f "$QCONFIG_H" ] && chmod +w "$QCONFIG_H" - echo "/* All features enabled while building qmake */" >"$QMAKE_QCONFIG_H" - fi - - mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H" - #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured rm -rf mkspecs/default mkspecs/default-host ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default @@ -3686,11 +3667,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi done - QMAKE_BUILD_ERROR=no - (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes - [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake - [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h - [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 + (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake #------------------------------------------------------------------------------- diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 957e1c8267..ac67d33986 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -55,7 +55,7 @@ */ #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if !defined(QT_BUILD_MOC) +#if !defined(QT_BUILD_MOC) && !defined(QT_BUILD_QMAKE) #include <QtCore/qconfig.h> #endif diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 9391ff148d..a55092cc22 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -41,7 +41,6 @@ #include "qdir.h" #include "qfile.h" -#include "qconfig.h" #include "qsettings.h" #include "qlibraryinfo.h" #include "qscopedpointer.h" |