1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move generation of qconfig.h forwarding headers to qtbase.pro

Browse Source 
less platform-specific code. the qfeatures.h generation is already here.

Change-Id: Ied69fb431eed5816fbff63b33be431ee913c2bc8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-02-03 21:19:48 +01:00 committed by The Qt Project
parent 46feffea1b
commit 13455344d7
3 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -6438,23 +6438,6 @@ else
mv -f "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h" mv -f "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
fi fi
# create a forwarding header
mkdir -p "$outpath/include/QtCore" || exit
echo '#include "../../src/corelib/global/qconfig.h"' > $outpath/include/QtCore/qconfig.h.new
if cmp -s "$outpath/include/QtCore/qconfig.h.new" "$outpath/include/QtCore/qconfig.h"; then
rm -f "$outpath/include/QtCore/qconfig.h.new"
else
mv "$outpath/include/QtCore/qconfig.h.new" "$outpath/include/QtCore/qconfig.h" || exit
fi
# create a camelcase forwarding header
echo '#include "qconfig.h"' > $outpath/include/QtCore/QtConfig.new
if cmp -s "$outpath/include/QtCore/QtConfig.new" "$outpath/include/QtCore/QtConfig"; then
rm -f "$outpath/include/QtCore/QtConfig.new"
else
mv "$outpath/include/QtCore/QtConfig.new" "$outpath/include/QtCore/QtConfig" || exit
fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# save configuration into qconfig.pri # save configuration into qconfig.pri
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

8
qtbase.pro
View File

@ -177,6 +177,14 @@ FEATURES_PRI = \
"QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)" "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)"
write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.") write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.")
# Create forwarding headers for qconfig.h
FWD_QCONFIG_H = \
'$${LITERAL_HASH}include "../../src/corelib/global/qconfig.h"'
write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error("Aborting.")
FWD_QTCONFIG = \
'$${LITERAL_HASH}include "qconfig.h"'
write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error("Aborting.")
#mkspecs #mkspecs
mkspecs.path = $$[QT_HOST_DATA]/mkspecs mkspecs.path = $$[QT_HOST_DATA]/mkspecs
mkspecs.files = \ mkspecs.files = \

17
tools/configure/configureapp.cpp
View File

@ -3520,23 +3520,6 @@ void Configure::generateConfigfiles()
dictionary[ "DONE" ] = "error"; dictionary[ "DONE" ] = "error";
} }
{
FileWriter tmpStream(buildPath + "/include/QtCore/qconfig.h");
tmpStream << "#include \"../../src/corelib/global/qconfig.h\"" << endl;
if (!tmpStream.flush())
dictionary[ "DONE" ] = "error";
}
{
FileWriter tmpStream(buildPath + "/include/QtCore/QtConfig");
tmpStream << "#include \"qconfig.h\"" << endl;
if (!tmpStream.flush())
dictionary[ "DONE" ] = "error";
}
if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL")) { if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL")) {
FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig_eval.cpp"); FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig_eval.cpp");