summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Lemanissier <eric.lemanissier@gmail.com>2015-11-04 18:16:01 +0100
committerEric Lemanissier <eric.lemanissier@gmail.com>2015-11-13 08:39:42 +0000
commit6b0be66831556649c0b8a7e2cd0cf421eef629cd (patch)
tree56d76338f7dfb66004d9c93433e8b9d8db591402 /src
parent4abafae33c9b911e8458f31b7611991d9430217b (diff)
Correct WinMain usage in AxServer under MinGW
The macro QT_NEEDS_QMAIN must be defined under MinGW, so that the entry point is WinMain in qaxservermain.cpp. Otherwise the entrypoint is main in qaxmain.cpp Task-number: QTBUG-41227 Change-Id: Iad6818e9a7b2a45afad47b44e0551be0eaae7858 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/control/control.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro
index c579ce8..b87c30e 100644
--- a/src/activeqt/control/control.pro
+++ b/src/activeqt/control/control.pro
@@ -5,6 +5,8 @@ CONFIG += static
DEFINES += QAX_SERVER
+mingw: DEFINES += QT_NEEDS_QMAIN
+
HEADERS = qaxaggregated.h \
qaxbindable.h \
qaxfactory.h \