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

bye-bye .qmake.cache

Browse Source 
well, not really - qt_parts.prf will still create one, but it will be
empty.

apart from being cleaner, this now finally makes it possible to load an
unconfigured qt source tree into qtcreator without random parts of the
tree being missing from the project explorer.

Change-Id: Ida7ee77ecb450af05bfa66106caf2067b02f1a7f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-24 13:38:22 +02:00 committed by The Qt Project
parent 684028a640
commit ae95f28997
3 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.qmake.conf
View File

@ -1,5 +1,8 @@
load(qt_build_config) load(qt_build_config)
CONFIG += qt_example_installs CONFIG += qt_example_installs
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)
# In qtbase, all modules follow qglobal.h # In qtbase, all modules follow qglobal.h
MODULE_VERSION = $$QT_VERSION MODULE_VERSION = $$QT_VERSION

18
configure vendored
View File

@ -6668,24 +6668,6 @@ else
mv -f "$QTMODULE.tmp" "$QTMODULE" mv -f "$QTMODULE.tmp" "$QTMODULE"
fi fi
#-------------------------------------------------------------------------------
# save configuration into .qmake.cache
#-------------------------------------------------------------------------------
CACHEFILE="$outpath/.qmake.cache"
[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
cat >>"$CACHEFILE.tmp" <<EOF
QT_SOURCE_TREE = \$\$quote($relpath)
QT_BUILD_TREE = \$\$quote($outpath)
EOF
# replace .qmake.cache if it differs from the newly created temp file
if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then
rm -f "$CACHEFILE.tmp"
else
mv -f "$CACHEFILE.tmp" "$CACHEFILE"
fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# give feedback on configuration # give feedback on configuration
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

11
tools/configure/configureapp.cpp
View File

@ -2812,17 +2812,6 @@ void Configure::generateOutputVars()
void Configure::generateCachefile() void Configure::generateCachefile()
{ {
// Generate .qmake.cache
{
FileWriter cacheStream(buildPath + "/.qmake.cache");
cacheStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl;
cacheStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl;
if (!cacheStream.flush())
dictionary[ "DONE" ] = "error";
}
// Generate qmodule.pri // Generate qmodule.pri
{ {
FileWriter moduleStream(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); FileWriter moduleStream(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri");