summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-26 15:14:18 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-10-26 15:14:18 +0000
commitf79e7c07237efcefe27d6ed5090e552cd9722e3d (patch)
tree9a1d1ac6576e882e8a8239b0fbb29fd3ddf2e4ad /qmake
parentea284937eaf27709e7a10a0a7b43e0bc91d4aa36 (diff)
parentfa9d12f4a20d618caedc77880459fa1af75fd50d (diff)
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/mingw_make.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index bad53dc5b7..792ffb1997 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -36,12 +36,6 @@
#include <stdlib.h>
#include <time.h>
-#ifdef Q_OS_WIN
-#define NULL_DEVICE "NUL"
-#else
-#define NULL_DEVICE "/dev/null"
-#endif
-
QT_BEGIN_NAMESPACE
MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator()
@@ -329,7 +323,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t)
if(!project->isEmpty("QMAKE_PRE_LINK"))
t << "\n\t" <<var("QMAKE_PRE_LINK");
if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
- t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET) 2>" NULL_DEVICE;
+ t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET) 2>" << var("QMAKE_SHELL_NULL_DEVICE");
if (project->values("OBJECTS").count() < var("QMAKE_LINK_OBJECT_MAX").toInt()) {
t << "\n\t$(LIB) $(DESTDIR_TARGET) " << objectsLinkLine << " " ;
} else {