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

cosmetics: remove redundant conditional, add a comment & reshuffle code

Browse Source 
Change-Id: I71c7e18db63f3581b8c818ad178aeb4f6ccf9446
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-23 19:01:26 +01:00 committed by Qt by Nokia
parent 8e5eb1bddc
commit 0bb99c6ff3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/project.cpp
View File

@ -530,9 +530,10 @@ static void qmake_error_msg(const QString &msg)
*/ */
QStringList qmake_feature_paths(QMakeProperty *prop=0) QStringList qmake_feature_paths(QMakeProperty *prop=0)
{ {
const QString mkspecs_concat = QLatin1String("/mkspecs");
const QString base_concat = QLatin1String("/features");
QStringList concat; QStringList concat;
{ {
const QString base_concat = QLatin1String("/features");
switch(Option::target_mode) { switch(Option::target_mode) {
case Option::TARG_MACX_MODE: //also a unix case Option::TARG_MACX_MODE: //also a unix
concat << base_concat + QLatin1String("/mac"); concat << base_concat + QLatin1String("/mac");
@ -549,7 +550,7 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
} }
concat << base_concat; concat << base_concat;
} }
const QString mkspecs_concat = QLatin1String("/mkspecs");
QStringList feature_roots; QStringList feature_roots;
QByteArray mkspec_path = qgetenv("QMAKEFEATURES"); QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
if(!mkspec_path.isNull()) if(!mkspec_path.isNull())
@ -574,9 +575,10 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
feature_roots << ((*it) + mkspecs_concat + (*concat_it)); feature_roots << ((*it) + mkspecs_concat + (*concat_it));
} }
} }
if(!Option::mkfile::qmakespec.isEmpty())
feature_roots << Option::mkfile::qmakespec + QLatin1String("/features");
if(!Option::mkfile::qmakespec.isEmpty()) { if(!Option::mkfile::qmakespec.isEmpty()) {
// The spec is already platform-dependent, so no subdirs here.
feature_roots << Option::mkfile::qmakespec + base_concat;
QFileInfo specfi(Option::mkfile::qmakespec); QFileInfo specfi(Option::mkfile::qmakespec);
if (!specfi.isRoot()) { if (!specfi.isRoot()) {
QDir specdir(specfi.absolutePath()); QDir specdir(specfi.absolutePath());