summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-16 07:58:32 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-16 07:58:32 +0200
commit17198e03ab36e5f579a1477b09cc3e601975eb5f (patch)
tree61ba826e9edd53469abdc1e1f58b1223d0336c56 /qmake/generators
parenta5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff)
parent2e2b32a9ab459f6618d02e4b454c75a787172def (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 58d6ecf110..029092fdaa 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -391,6 +391,12 @@ void NmakeMakefileGenerator::init()
if (!defines.contains("NDEBUG"))
defines.append("NDEBUG");
}
+
+ if (project->values("QMAKE_APP_FLAG").isEmpty() && project->isActiveConfig("dll")) {
+ ProStringList &defines = project->values("DEFINES");
+ if (!defines.contains("_WINDLL"))
+ defines.append("_WINDLL");
+ }
}
QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()