From 3a806254fe265583f3871ed4629e13b23675ac86 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 24 Jun 2019 17:18:20 +0200
Subject: Fix 'clean' target for MinGW DLLs

'make clean' removed the import libs for DLLs which makes them quite
unusable. Move the import lib removal to the 'distclean' target.

Fixes: QTBUG-51977
Change-Id: I727d520435f88a83a7fb14cb0ad81f8fe7c6d61b
Reviewed-by: Oliver Wolff <oliver.wolff@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 de7363e51b..746f3e9008 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -254,7 +254,7 @@ void MingwMakefileGenerator::init()
     }
 
     if(project->isActiveConfig("dll")) {
-        project->values("QMAKE_CLEAN").append(project->first("MINGW_IMPORT_LIB"));
+        project->values("QMAKE_DISTCLEAN").append(project->first("MINGW_IMPORT_LIB"));
     }
 }
 
-- 
cgit v1.2.3


From f6db25962e820d7709c2f235f02893dd3edde4f4 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 24 Jun 2019 17:36:41 +0200
Subject: Add QDebug streaming operator for ProString

This saves us lots of .toQString() and .toQStringList() typing when
qDebug()'ing qmake code.

Change-Id: I037e5e1816f2dcb6a20dec4c275f3d886f155ad5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 qmake/library/proitems.cpp | 5 +++++
 qmake/library/proitems.h   | 3 +++
 2 files changed, 8 insertions(+)

(limited to 'qmake')

diff --git a/qmake/library/proitems.cpp b/qmake/library/proitems.cpp
index 8bbde9f8c0..41bed69f00 100644
--- a/qmake/library/proitems.cpp
+++ b/qmake/library/proitems.cpp
@@ -517,4 +517,9 @@ ProKey ProFile::getHashStr(const ushort *&tPtr)
     return ret;
 }
 
+QDebug operator<<(QDebug debug, const ProString &str)
+{
+    return debug << str.toQString();
+}
+
 QT_END_NAMESPACE
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 71e5e05367..0e0bebddc7 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -31,6 +31,7 @@
 
 #include "qmake_global.h"
 
+#include <qdebug.h>
 #include <qstring.h>
 #include <qvector.h>
 #include <qhash.h>
@@ -468,6 +469,8 @@ struct ProFunctionDefs {
     QHash<ProKey, ProFunctionDef> replaceFunctions;
 };
 
+QDebug operator<<(QDebug debug, const ProString &str);
+
 QT_END_NAMESPACE
 
 #endif // PROITEMS_H
-- 
cgit v1.2.3