AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't require (dummy) qconfig.h for qmake build

Browse Source 
Change-Id: I22a2c9aa1366ff858b3bb646617543968c810136
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-09-11 15:22:29 +02:00 committed by Qt by Nokia
parent 0b2d55390c
commit 074a5ce50e
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@ -3557,25 +3557,6 @@ setBootstrapVariable()
if true; then ###[ '!' -f "$outpath/bin/qmake" ]; if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake. Please wait..." 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 #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
rm -rf mkspecs/default mkspecs/default-host rm -rf mkspecs/default mkspecs/default-host
ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
@ -3686,11 +3667,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
fi fi
done done
QMAKE_BUILD_ERROR=no (cd "$outpath/qmake"; "$MAKE") || exit 2
(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
fi # Build qmake fi # Build qmake
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

2
src/corelib/global/qglobal.h
View File

@ -55,7 +55,7 @@
*/ */
#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) #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> #include <QtCore/qconfig.h>
#endif #endif

1
src/corelib/global/qlibraryinfo.cpp
View File

@ -41,7 +41,6 @@
#include "qdir.h" #include "qdir.h"
#include "qfile.h" #include "qfile.h"
#include "qconfig.h"
#include "qsettings.h" #include "qsettings.h"
#include "qlibraryinfo.h" #include "qlibraryinfo.h"
#include "qscopedpointer.h" #include "qscopedpointer.h"