diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 10:46:16 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 10:46:16 +1000 |
| commit | b885787eee96f444e73c7a9d6f6b63f65ef2c172 (patch) | |
| tree | 6155bcb6bd920c6dd021218d93126c12c3db07a1 /qmake/project.cpp | |
| parent | 57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff) | |
| parent | 5422e929cad04633a06c156cba96cfcd69262522 (diff) | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
Avoid possible font name collisions on fbserv
Update of Czech translation for Qt 4.7-stable
Fix crash in QtScript/JSC stack allocator on Symbian
HTTP: fix digest authentication
Fix loop count in animanted gifs sometimes being incorrect
Fixed UTF-8 application names in device application menu in Symbian
Validate arguments to QDBusConnection::connect
make the test a bit stricter
ignore the warning from auto-detach in destructor
get rid of extra calls to handle()
simplify QSharedMemory::detach()
avoid extra calculations
fix error reporting on detach()
fix error reporting
Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
Fix to pen state handling in OpenVG paint engine.
BorderImage fails for .sci source containing a URL
positionViewAtIndex can fail when positioned near end of list.
Revert "Fix loaded() signal to be emitted only once"
Revert "don't include harfbuzz where we don't use it"
...
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 88d5962e5a..af8cdf634d 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1639,6 +1639,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL if(flags & IncludeFlagFeature) { if(!file.endsWith(Option::prf_ext)) file += Option::prf_ext; + validateModes(); // init dir_sep if(file.indexOf(Option::dir_sep) == -1 || !QFile::exists(file)) { static QStringList *feature_roots = 0; if(!feature_roots) { @@ -2985,6 +2986,7 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList var = ".BUILTIN." + var; place[var] = QStringList(qmake_getpwd()); } else if(var == QLatin1String("DIR_SEPARATOR")) { + validateModes(); var = ".BUILTIN." + var; place[var] = QStringList(Option::dir_sep); } else if(var == QLatin1String("DIRLIST_SEPARATOR")) { |