diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:33:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:33:14 +0100 |
| commit | 2b4bb402b3cb753c6fafa99a5e4ec54ad46e419e (patch) | |
| tree | 92c5972825c64d3e81b0307494259a9c8f79b628 /src | |
| parent | c95d0202b670b5a0ef937126d19e6e40c8fe7deb (diff) | |
| parent | 635f2a07bb33f1a28b0b3fc2d0d997f32e9dc7fc (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id07b03ae385ddbba6cbc63ad84789bc6037545c8
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/control.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 26 | ||||
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 2 |
3 files changed, 20 insertions, 10 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 \ diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index ae3f5b5..96cd503 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.cpp @@ -243,15 +243,23 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, if (run) { if (SUCCEEDED(CoInitialize(0))) { - int argc; - QVector<char*> argv(8); - qWinMain(hInstance, hPrevInstance, unprocessed.data(), nShowCmd, argc, argv); - qAxInit(); - if (runServer) - QAxFactory::startServer(); - nRet = ::main(argc, argv.data()); - QAxFactory::stopServer(); - qAxCleanup(); + { + struct Arg { + int c; + QVector<char*> v; + + Arg() : v(8) {} + ~Arg() { Q_FOREACH (char *arg, v) free(arg); } + } arg; + + qWinMain(hInstance, hPrevInstance, unprocessed.data(), nShowCmd, arg.c, arg.v); + qAxInit(); + if (runServer) + QAxFactory::startServer(); + nRet = ::main(arg.c, arg.v.data()); + QAxFactory::stopServer(); + qAxCleanup(); + } CoUninitialize(); } else { qErrnoWarning("CoInitialize() failed."); diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index f5f2594..df3175b 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -4,7 +4,7 @@ project = ActiveQt description = ActiveQt version = $QT_VERSION -examplesinstallpath = +examplesinstallpath = qtactiveqt qhp.projects = ActiveQt |