diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-01 21:44:54 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 23:52:34 +0100 |
commit | 2640b71be405790440c1cd939ab6d67a4ab3757f (patch) | |
tree | eed9fced8d3faee8294b651b7a72b6ad5dfa2726 | |
parent | d59e85d9095f5d8fa787149fe8d34e8dfac0a0b5 (diff) |
remove support for QMAKE_PLATFORM_DIR
this was a somewhat magic support for sysroots, automatically rewriting
a number of path-holding variables. this was (as usual) completely
undocumented, extremely fragile, and we are coming up with something
better now anyway.
Change-Id: I045910f532cb3efc839ea81c7a48f8db695e4092
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r-- | qmake/generators/makefile.cpp | 32 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 3 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 1 |
3 files changed, 0 insertions, 36 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 63367f116a..1904b8f6c6 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -306,7 +306,6 @@ MakefileGenerator::setProjectFile(QMakeProject *p) return; project = p; init(); - usePlatformDir(); findLibraries(); if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE && project->isActiveConfig("link_prl")) //load up prl's' @@ -1028,7 +1027,6 @@ MakefileGenerator::writePrlFile(QTextStream &t) bool MakefileGenerator::writeProjectMakefile() { - usePlatformDir(); QTextStream t(&Option::output); //header @@ -1146,36 +1144,6 @@ MakefileGenerator::writePrlFile() } } -// Manipulate directories, so it's possible to build -// several cross-platform targets concurrently -void -MakefileGenerator::usePlatformDir() -{ - QString pltDir(project->first("QMAKE_PLATFORM_DIR")); - if(pltDir.isEmpty()) - return; - QChar sep = QDir::separator(); - QString slashPltDir = sep + pltDir; - - QString dirs[] = { QString("OBJECTS_DIR"), QString("DESTDIR"), QString("QMAKE_PKGCONFIG_DESTDIR"), - QString("SUBLIBS_DIR"), QString("DLLDESTDIR"), QString("QMAKE_LIBTOOL_DESTDIR"), - QString("PRECOMPILED_DIR"), QString("QMAKE_LIBDIR_QT"), QString() }; - for(int i = 0; !dirs[i].isEmpty(); ++i) { - QString filePath = project->first(dirs[i]); - project->values(dirs[i]) = QStringList(filePath + (filePath.isEmpty() ? pltDir : slashPltDir)); - } - - QString libs[] = { QString("QMAKE_LIBS_QT"), QString("QMAKE_LIBS_QT_THREAD"), QString("QMAKE_LIBS_QT_ENTRY"), QString() }; - for(int i = 0; !libs[i].isEmpty(); ++i) { - QString filePath = project->first(libs[i]); - int fpi = filePath.lastIndexOf(sep); - if(fpi == -1) - project->values(libs[i]).prepend(pltDir + sep); - else - project->values(libs[i]) = QStringList(filePath.left(fpi) + slashPltDir + filePath.mid(fpi)); - } -} - void MakefileGenerator::writeObj(QTextStream &t, const QString &src) { diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 68d247a8f3..5b64ea68fb 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -198,9 +198,6 @@ protected: filterIncludedFiles("GENERATED_SOURCES"); } - //for cross-platform dependent directories - virtual void usePlatformDir(); - //for installs virtual QString defaultInstall(const QString &); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 434d4b4559..2f19ea4495 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -247,7 +247,6 @@ bool VcprojGenerator::writeMakefile(QTextStream &t) bool VcprojGenerator::writeProjectMakefile() { - usePlatformDir(); QTextStream t(&Option::output); // Check if all requirements are fulfilled |