diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
| commit | bada5f8ea74d6d9d2a60b35f4d271da143aced51 (patch) | |
| tree | 7b936bc66691fec2efee0a2f8685b06fdac36497 /src/activeqt/control/control.pro | |
| parent | c550735ebeb937a36b82c161f0fed4e35b8776bb (diff) | |
| parent | 555527b6992374f8a5139674a316e819f9d5685f (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/activeqt/control/qaxserverbase.cpp
Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
Diffstat (limited to 'src/activeqt/control/control.pro')
| -rw-r--r-- | src/activeqt/control/control.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index b87c30e..e55bdab 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -10,6 +10,7 @@ mingw: DEFINES += QT_NEEDS_QMAIN HEADERS = qaxaggregated.h \ qaxbindable.h \ qaxfactory.h \ + qclassfactory_p.h \ ../shared/qaxtypes.h SOURCES = qaxaggregated.cpp \ @@ -22,6 +23,8 @@ SOURCES = qaxaggregated.cpp \ qaxmain.cpp \ ../shared/qaxtypes.cpp +LIBS += -lshell32 + MODULE = axserver MODULE_DEFINES = QAXSERVER MODULE_CONFIG = idcidl force_import_plugins |