summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-22 09:47:31 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-03-22 09:47:31 (GMT)
commit13d4be08d1d07434515855e7fde8c3ab589358c4 (patch)
treebf83b20fb4707e7279df39fd6e38bbee36ee22ca /qmake/project.cpp
parent9e85af3454bd0a2d962523d52e688f9bc7259528 (diff)
parent011c6d0f7498bf390e8df1ae646cfb649d8e143f (diff)
downloadQt-13d4be08d1d07434515855e7fde8c3ab589358c4.zip
Qt-13d4be08d1d07434515855e7fde8c3ab589358c4.tar.gz
Qt-13d4be08d1d07434515855e7fde8c3ab589358c4.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp1
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);
}