From 43663bc87daed85a3da7f2cfcbea26a5f1ead8dd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 30 Jan 2012 20:14:29 +0100 Subject: export QMAKESPEC to the project this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a192f8aa75..26160976bb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2674,19 +2674,6 @@ void Configure::generateCachefile() moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; - QString hostSpec = dictionary[ "QMAKESPEC" ]; - QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : hostSpec; - QString xmkspec_path = sourcePath + "/mkspecs/" + targetSpec; - if (QFile::exists(xmkspec_path)) - moduleStream << "XQMAKESPEC = " << xmkspec_path << endl; - else - moduleStream << "XQMAKESPEC = " << targetSpec << endl; - QString mkspec_path = sourcePath + "/mkspecs/" + hostSpec; - if (QFile::exists(mkspec_path)) - moduleStream << "QMAKESPEC = " << mkspec_path << endl; - else - moduleStream << "QMAKESPEC = " << hostSpec << endl; - if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; -- cgit v1.2.3