diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-28 14:42:27 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-28 14:42:27 (GMT) |
| commit | 4250f602fd86418adaaa38616a5f71640b2a9132 (patch) | |
| tree | 1781a186d8967874e633bda6be15353df5717d56 /qmake | |
| parent | 869a1c838ec58051f355552435049b58c6fbe354 (diff) | |
| parent | 4da2ba2e788bb63a155e1d10ae559d4366eed875 (diff) | |
| download | Qt-4250f602fd86418adaaa38616a5f71640b2a9132.zip Qt-4250f602fd86418adaaa38616a5f71640b2a9132.tar.gz Qt-4250f602fd86418adaaa38616a5f71640b2a9132.tar.bz2 | |
Merge remote branch 'origin/master' into 4.8-earth
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 7cc1cb6..815f210 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1651,7 +1651,6 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL if(file.indexOf(Option::dir_sep) == -1 || !QFile::exists(file)) { static QStringList *feature_roots = 0; if(!feature_roots) { - validateModes(); feature_roots = new QStringList(qmake_feature_paths(prop)); qmakeAddCacheClear(qmakeDeleteCacheClear<QStringList>, (void**)&feature_roots); } |