1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove support for QMAKE_PLATFORM_DIR

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-03-01 21:44:54 +01:00 committed by Qt by Nokia
parent d59e85d909
commit 2640b71be4
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qmake/generators/makefile.cpp
View File

@ -306,7 +306,6 @@ MakefileGenerator::setProjectFile(QMakeProject *p)
return; return;
project = p; project = p;
init(); init();
usePlatformDir();
findLibraries(); findLibraries();
if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE && if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE &&
project->isActiveConfig("link_prl")) //load up prl's' project->isActiveConfig("link_prl")) //load up prl's'
@ -1028,7 +1027,6 @@ MakefileGenerator::writePrlFile(QTextStream &t)
bool bool
MakefileGenerator::writeProjectMakefile() MakefileGenerator::writeProjectMakefile()
{ {
usePlatformDir();
QTextStream t(&Option::output); QTextStream t(&Option::output);
//header //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 void
MakefileGenerator::writeObj(QTextStream &t, const QString &src) MakefileGenerator::writeObj(QTextStream &t, const QString &src)
{ {

3
qmake/generators/makefile.h
View File

@ -198,9 +198,6 @@ protected:
filterIncludedFiles("GENERATED_SOURCES"); filterIncludedFiles("GENERATED_SOURCES");
} }
//for cross-platform dependent directories
virtual void usePlatformDir();
//for installs //for installs
virtual QString defaultInstall(const QString &); virtual QString defaultInstall(const QString &);

1
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -247,7 +247,6 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
bool VcprojGenerator::writeProjectMakefile() bool VcprojGenerator::writeProjectMakefile()
{ {
usePlatformDir();
QTextStream t(&Option::output); QTextStream t(&Option::output);
// Check if all requirements are fulfilled // Check if all requirements are fulfilled