diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-26 10:09:50 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-26 10:09:50 (GMT) |
| commit | 1386d291082aaf7ebb55f0ebce20bca0ed89ae53 (patch) | |
| tree | ecf3ba541d68c44aef2ffcdb159f45482b386a95 /qmake | |
| parent | 337ffb38e35ca43e4119ac0634499b226137692e (diff) | |
| parent | 9ebd170981c5e46ec17ae0f5d146e04ccc28dbee (diff) | |
| download | Qt-1386d291082aaf7ebb55f0ebce20bca0ed89ae53.zip Qt-1386d291082aaf7ebb55f0ebce20bca0ed89ae53.tar.gz Qt-1386d291082aaf7ebb55f0ebce20bca0ed89ae53.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
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("\""); |