diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 12:53:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 12:53:55 (GMT) |
| commit | e9c39c5b05f3938105277decb385e34d14ffdae6 (patch) | |
| tree | d61b4c877cd14247ae0de260034cb99494434c5d /qmake/project.cpp | |
| parent | 53038b678ccba374da5ce9ad216044f075a3ffd8 (diff) | |
| parent | 8f83747d12efc612b730a7dd911f916127387c0c (diff) | |
| download | Qt-e9c39c5b05f3938105277decb385e34d14ffdae6.zip Qt-e9c39c5b05f3938105277decb385e34d14ffdae6.tar.gz Qt-e9c39c5b05f3938105277decb385e34d14ffdae6.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits)
Rhys Weatherley's changes for 4.6.2
Autotest: to be sure, generate .cpp files with the proper headers too
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
revert to fromUtf16() usage in fromWCharArray()
S60 softkey refactoring (support for merging, priorities and menus)
Implementation for QVGPixmapData to/fromSymbianCFbsBitmap
Updated changlog 4.6.2
Fix license headers on these new files (and the generator).
Add auto-generated tests for QScriptValue
Add changes for 4.6.2
Assistant examples: Fix missing QLatin1String.
Changelog: Added Designer/uic3 changes for 4.6.2
Revert "Improve raster graphics system performance on Mac."
Added Czech translations.
Introduce of QScriptValue autotest generator.
Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"
Fixed potential crash in mac style
...
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index c2e033e..4ce8ba4 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3067,7 +3067,7 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList place[var] = QStringList(pfile); } else if(var == QLatin1String("_PRO_FILE_PWD_")) { var = ".BUILTIN." + var; - place[var] = QStringList(QFileInfo(pfile).absolutePath()); + place[var] = QStringList(pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath()); } else if(var == QLatin1String("_QMAKE_CACHE_")) { var = ".BUILTIN." + var; if(Option::mkfile::do_cache) |