diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-25 15:11:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 14:08:27 +0100 |
| commit | 64d03e1c3400baf15a2e281142297aa8fe940d48 (patch) | |
| tree | c2a264b7d549ecd0b8d4179c318d145e596f7bc5 /qmake/main.cpp | |
| parent | c1771a78ed0ceab26891b3fdf801dc5557173fac (diff) | |
| download | qtbase-64d03e1c3400baf15a2e281142297aa8fe940d48.tar.gz | |
do not append a trailing slash to output directory
it's entirely counterproductive and confuses the subsequent code.
Change-Id: Iadcfd2af80acd2d7ed50807b3e001e26d83075a5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index e339239289..7ea076be17 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -97,15 +97,8 @@ int runQMake(int argc, char **argv) } QString oldpwd = qmake_getpwd(); -#ifdef Q_OS_WIN - if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/"))) -#endif - { - if(!oldpwd.endsWith(QLatin1Char('/'))) - oldpwd += QLatin1Char('/'); - } - Option::output_dir = oldpwd; //for now this is the output dir + Option::output_dir = oldpwd; //for now this is the output dir if(Option::output.fileName() != "-") { QFileInfo fi(Option::output); QString dir; @@ -119,7 +112,7 @@ int runQMake(int argc, char **argv) if(!dir.isNull() && dir != ".") Option::output_dir = dir; if(QDir::isRelativePath(Option::output_dir)) - Option::output_dir.prepend(oldpwd); + Option::output_dir.prepend(oldpwd + QLatin1Char('/')); Option::output_dir = QDir::cleanPath(Option::output_dir); } |