From f1838fd69274a37bd65fed112fa0eef868556535 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 15 Oct 2017 10:37:22 +0300
Subject: qmake: Actually resolve QMAKE_SHELL_NULL_DEVICE when writing to
 Makefile

This is C++, not qmake code. Amends 5fa6438633.

Change-Id: Ie5b88c3a06dbe089948488ea3b4b297a08164113
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 qmake/generators/win32/mingw_make.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qmake')

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index f9c3870192..792ffb1997 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -323,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>$$QMAKE_SHELL_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 {
-- 
cgit v1.2.3