add QMakeOption::do_cache

... because qmake has it.

Change-Id: Idc2c9f6a041ff1d60d95e8a2ad400f7d41f3d2d2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-08 17:56:45 +02:00
parent 8ad7ebbd28
commit 9e60457d59
3 changed files with 5 additions and 0 deletions

View File

@@ -914,6 +914,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
// ### init QMAKE_EXT_{C,H,CPP,OBJ} // ### init QMAKE_EXT_{C,H,CPP,OBJ}
// ### init TEMPLATE_PREFIX // ### init TEMPLATE_PREFIX
if (m_option->do_cache) {
QString qmake_cache = m_option->cachefile; QString qmake_cache = m_option->cachefile;
if (qmake_cache.isEmpty() && !m_outputDir.isEmpty()) { //find it as it has not been specified if (qmake_cache.isEmpty() && !m_outputDir.isEmpty()) { //find it as it has not been specified
QDir dir(m_outputDir); QDir dir(m_outputDir);
@@ -941,6 +942,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
} }
} }
m_option->cachefile = qmake_cache; m_option->cachefile = qmake_cache;
}
loadSpec(); loadSpec();

View File

@@ -93,6 +93,8 @@ QMakeGlobals::QMakeGlobals()
{ {
initStatics(); initStatics();
do_cache = true;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
dirlist_sep = QLatin1Char(';'); dirlist_sep = QLatin1Char(';');
dir_sep = QLatin1Char('\\'); dir_sep = QLatin1Char('\\');

View File

@@ -56,6 +56,7 @@ public:
QMakeGlobals(); QMakeGlobals();
~QMakeGlobals(); ~QMakeGlobals();
bool do_cache;
QString dir_sep; QString dir_sep;
QString dirlist_sep; QString dirlist_sep;
QString qmakespec; QString qmakespec;