diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 03:26:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 03:26:19 (GMT) |
| commit | 31450ba3b0d83dba4e171ae966295b173ac1fb0f (patch) | |
| tree | 4eb888ca8a5d2e9d593c4cc904fd77c242e5f27d /qmake/main.cpp | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| parent | 0fa408468327672f7e1ad8c628dc073c43bf2b3f (diff) | |
| download | Qt-31450ba3b0d83dba4e171ae966295b173ac1fb0f.zip Qt-31450ba3b0d83dba4e171ae966295b173ac1fb0f.tar.gz Qt-31450ba3b0d83dba4e171ae966295b173ac1fb0f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
fix "configure -fast" on Windows for other maketools than nmake
Get qmake to add pdb files to install target in debug configuration.
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
give symbian an own platform mode
deprecate -win32/-unix/-macx which set both host and target mode
decouple host platform mode from target platform mode
factor out applyHostMode()
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
use QDir::separator() instead of Option::dir_sep where appropriate
simplify string ops
sanitize evaluation of OS scopes
instead of hard-coding recursion for symbian, add it to the specs
add possibility to request project recursion from within a pro file
fix ts-assistant target
use QList::reserve() as appropriate
optimize appending of (empty) lists to (empty) lists
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
...
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 50f9272..42679a2 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -149,7 +149,7 @@ int runQMake(int argc, char **argv) //setup pwd properly debug_msg(1, "Resetting dir to: %s", oldpwd.toLatin1().constData()); qmake_setpwd(oldpwd); //reset the old pwd - int di = fn.lastIndexOf(Option::dir_sep); + int di = fn.lastIndexOf(QDir::separator()); if(di != -1) { debug_msg(1, "Changing dir to: %s", fn.left(di).toLatin1().constData()); if(!qmake_setpwd(fn.left(di))) |