From c4eed770be883a66a5dc7bf511580bc9d97f2eb2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 26 Mar 2012 14:58:59 +0200 Subject: purge QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT they are equivalent to QT_INSTALL_(HEADERS|LIBS)/get. Change-Id: Ic4b47f3ca7db55785b96f19020a2fa020a8d25bd Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 1fe19b4264..2e813af8f1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2583,11 +2583,6 @@ void Configure::generateCachefile() moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; - //so that we can build without an install first (which would be impossible) - moduleStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl; - moduleStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; - moduleStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; - QString hostSpec = dictionary[ "QMAKESPEC" ]; QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : hostSpec; QString xmkspec_path = sourcePath + "/mkspecs/" + targetSpec; -- cgit v1.2.3