summaryrefslogtreecommitdiff
path: root/qmake/main.cpp
Side-by-side diff
Diffstat (limited to 'qmake/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/main.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp
index eed1697..cc2d08a 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -60,8 +60,13 @@ int main(int argc, char **argv)
QDir sunworkshop42workaround = QDir::current();
QString oldpwd = sunworkshop42workaround.currentDirPath();
Option::output_dir = oldpwd; //for now this is the output dir
- if(Option::output_dir.right(1) != QString(QChar(QDir::separator())))
- Option::output_dir += QDir::separator();
+#ifdef Q_WS_WIN
+ if ( !(Option::output_dir.length() == 3 && Option::output_dir[0].isLetter() && Option::output_dir.endsWith(":/") ) )
+#endif
+ {
+ if(Option::output_dir.right(1) != QString(QChar(QDir::separator())))
+ Option::output_dir += QDir::separator();
+ }
QMakeProject proj;
int exit_val = 0;
QStringList files;