diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
| commit | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (patch) | |
| tree | 2cdd417bc0be39b12674f33052462d19d9e38ef9 /qmake | |
| parent | 7b1f8c542bc9f41408f0a54b853d75d0c09a2775 (diff) | |
| parent | d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b (diff) | |
| download | Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.zip Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.gz Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 87f55cf..c7f00dd 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -626,7 +626,7 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t) // do this here so we can set DEST_TARGET to be the complete path to the final target if it is needed. QString orgDestDir = var("DESTDIR"); QString destDir = Option::fixPathToTargetOS(orgDestDir, false); - if (orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep)) + if (!destDir.isEmpty() && (orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep))) destDir += Option::dir_sep; QString target = QString(project->first("TARGET")+project->first("TARGET_EXT")); target.remove("\""); |