Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf
	src/activeqt/control/qaxserverbase.cpp

Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19

21 files changed, 580 insertions, 206 deletions

diff --git a/.gitignore b/.gitignore
index 2de9614..f932ee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,43 +6,36 @@ examples/*/*/*
 !examples/*/*/README
 examples/*/*/*[.]app
 
-callgrind.out.*
 pcviewer.cfg
 *~
 *.a
 *.la
 *.core
 *.moc
-*.o
 *.obj
 *.orig
 *.swp
 *.rej
-*.so
-*.pbxuser
 *.mode1
 *.mode1v3
 *_pch.h.cpp
 *_resource.rc
 .#*
 *.*#
-core
 .qmake.cache
 .qmake.vars
-*.prl
 tags
-.DS_Store
 *.debug
 Makefile*
 *.prl
-*.app
 *.pro.user
 *.qmlproject.user
 *.gcov
 moc_*.cpp
 ui_*.h
-tools/activeqt/testcon/testcon.tlb
+tools/testcon/testcon.tlb
 qrc_*.cpp
+*_wrapper.bat
 
 # Test generated files
 QObject.log
@@ -87,15 +80,9 @@ tst_*~
 debug
 release
 tmp
-doc-build
-doc/html/*
-doc/qch
-doc-build
 .rcc
 .pch
 .metadata
 
-.pc/
-
 # Generated static plugin import sources
 *_plugin_import.cpp
diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1
new file mode 100644
index 0000000..c9480b0
--- /dev/null
+++ b/dist/changes-5.7.1
@@ -0,0 +1,24 @@
+Qt 5.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.7.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index dcfdb81..97b22bd 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -8,6 +8,7 @@ SUBDIRS      += comapp \
 
 contains(QT_CONFIG, shared):SUBDIRS += webbrowser
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
+qtHaveModule(quickcontrols2):SUBDIRS += simpleqml
 
 # For now only the contain examples with mingw, for the others you need
 # an IDL compiler
diff --git a/examples/activeqt/simple/main.cpp b/examples/activeqt/simple/main.cpp
index 49d7b2a..4e855b3 100644
--- a/examples/activeqt/simple/main.cpp
+++ b/examples/activeqt/simple/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/activeqt/simpleqml/main.cpp b/examples/activeqt/simpleqml/main.cpp
new file mode 100644
index 0000000..8983b22
--- /dev/null
+++ b/examples/activeqt/simpleqml/main.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QAxBindable>
+#include <QAxFactory>
+#include <QMainWindow>
+#include <QQuickWidget>
+#include <QQmlContext>
+
+class Controller : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
+    Q_PROPERTY(QColor color READ color NOTIFY valueChanged)
+public:
+    explicit Controller(QWidget *parent = 0) :
+        QObject(parent),
+        m_value(0)
+    { }
+
+    qreal value() const { return m_value; }
+
+    void setValue(qreal value)
+    {
+        if (value < 0) value = 0;
+        if (value > 1) value = 1;
+
+        m_value = value;
+        valueChanged();
+    }
+
+    QColor color() const
+    {
+        QColor start = Qt::yellow;
+        QColor end = Qt::magenta;
+
+        // Linear interpolation between two colors in HSV space
+        return QColor::fromHsvF(
+            start.hueF()        * (1.0f - m_value) + end.hueF()        * m_value,
+            start.saturationF() * (1.0f - m_value) + end.saturationF() * m_value,
+            start.valueF()      * (1.0f - m_value) + end.valueF()      * m_value,
+            start.alphaF()      * (1.0f - m_value) + end.alphaF()      * m_value
+        );
+    }
+
+signals:
+    void valueChanged();
+
+private:
+    qreal m_value;
+};
+
+class QSimpleQmlAx : public QMainWindow
+{
+    Q_OBJECT
+    Q_CLASSINFO("ClassID", "{50477337-58FE-4898-8FFC-6F6199CEAE08}")
+    Q_CLASSINFO("InterfaceID", "{A5EC7D99-CEC9-4BD1-8336-ED15A579B185}")
+    Q_CLASSINFO("EventsID", "{5BBFBCFD-20FD-48A3-96C7-1F6649CD1F52}")
+public:
+    explicit QSimpleQmlAx(QWidget *parent = 0) :
+        QMainWindow(parent)
+    {
+        auto ui = new QQuickWidget(this);
+
+        // Register our type to qml
+        qmlRegisterType<Controller>("app", 1, 0, "Controller");
+
+        // Initialize view
+        ui->rootContext()->setContextProperty("context", QVariant::fromValue(new Controller(this)));
+        ui->setMinimumSize(200, 200);
+        ui->setResizeMode(QQuickWidget::SizeRootObjectToView);
+        ui->setSource(QUrl("qrc:/main.qml"));
+        setCentralWidget(ui);
+    }
+};
+
+#include "main.moc"
+
+QAXFACTORY_BEGIN(
+    "{E544E321-EF8B-4CD4-91F6-DB55A59DBADB}", // type library ID
+    "{E37E3131-DEA2-44EB-97A2-01CDD09A5A4D}") // application ID
+    QAXCLASS(QSimpleQmlAx)
+QAXFACTORY_END()
diff --git a/examples/activeqt/simpleqml/main.qml b/examples/activeqt/simpleqml/main.qml
new file mode 100644
index 0000000..cb75da2
--- /dev/null
+++ b/examples/activeqt/simpleqml/main.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.5
+import QtQuick.Controls 2.0
+
+import app 1.0
+
+Rectangle {
+    // Properties from context
+    property Controller controller: context
+
+    color: controller.color
+
+    Label {
+        id: idText
+        text: "Color slider"
+        anchors.top: parent.top
+        anchors.left: parent.left
+        color: "black"
+        font.pixelSize: 12
+    }
+
+    Slider {
+        value: controller.value
+        onVisualPositionChanged: controller.value = visualPosition
+
+        anchors.top: idText.bottom
+        anchors.left: parent.left
+    }
+}
diff --git a/examples/activeqt/simpleqml/simpleqml.def b/examples/activeqt/simpleqml/simpleqml.def
new file mode 100644
index 0000000..b6ede3c
--- /dev/null
+++ b/examples/activeqt/simpleqml/simpleqml.def
@@ -0,0 +1,8 @@
+; simpleqml.def : Declares the module parameters.
+
+EXPORTS
+    DllCanUnloadNow      PRIVATE
+    DllGetClassObject    PRIVATE
+    DllRegisterServer    PRIVATE
+    DllUnregisterServer  PRIVATE
+    DumpIDL              PRIVATE
diff --git a/examples/activeqt/simpleqml/simpleqml.ico b/examples/activeqt/simpleqml/simpleqml.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/examples/activeqt/simpleqml/simpleqml.ico
diff --git a/examples/activeqt/simpleqml/simpleqml.pro b/examples/activeqt/simpleqml/simpleqml.pro
new file mode 100644
index 0000000..9043e9d
--- /dev/null
+++ b/examples/activeqt/simpleqml/simpleqml.pro
@@ -0,0 +1,15 @@
+include(../shared.pri)
+
+TEMPLATE = lib
+TARGET   = simpleqmlax
+
+QT += widgets axserver quick quickwidgets
+
+SOURCES = main.cpp
+RC_FILE  = simpleqml.rc
+DEF_FILE = simpleqml.def
+RESOURCES = simpleqml.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simpleqml
+INSTALLS += target
diff --git a/examples/activeqt/simpleqml/simpleqml.qrc b/examples/activeqt/simpleqml/simpleqml.qrc
new file mode 100644
index 0000000..5f6483a
--- /dev/null
+++ b/examples/activeqt/simpleqml/simpleqml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/activeqt/simpleqml/simpleqml.rc b/examples/activeqt/simpleqml/simpleqml.rc
new file mode 100644
index 0000000..7a6d549
--- /dev/null
+++ b/examples/activeqt/simpleqml/simpleqml.rc
@@ -0,0 +1,2 @@
+1 TYPELIB "simpleqml.rc"
+1 ICON DISCARDABLE "simpleqml.ico"
diff --git a/qtactiveqt.pro b/qtactiveqt.pro
index 039aaad..45b79f1 100644
--- a/qtactiveqt.pro
+++ b/qtactiveqt.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(widgets))
+
 CONFIG += tests_need_tools
 load(qt_parts)
 
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 36bf4e6..4c0bae7 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3396,7 +3396,7 @@ static bool checkHRESULT(HRESULT hres, EXCEPINFO *exc, QAxBase *that, const QStr
     case DISP_E_EXCEPTION:
         {
             bool printWarning = true;
-            unsigned short code = ushort(-1);
+            unsigned int code = uint(-1);
             QString source, desc, help;
             const QMetaObject *mo = that->metaObject();
             int exceptionSignal = mo->indexOfSignal("exception(int,QString,QString,QString)");
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 8c74159..3e927f4 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -759,8 +759,20 @@ void QAxClientSite::releaseAll()
 
 void QAxClientSite::deactivate()
 {
-    if (m_spInPlaceObject) m_spInPlaceObject->InPlaceDeactivate();
-    // if this assertion fails the control didn't call OnInPlaceDeactivate
+    if (!m_spInPlaceObject)
+        return;
+
+    // InPlaceDeactivate should trigger an OnInPlaceDeactivate callback
+    HRESULT hr = m_spInPlaceObject->InPlaceDeactivate();
+
+    // call fails if an out-of-process control crashes
+    if (FAILED(hr)) {
+        // Call OnInPlaceDeactivate directly to clean up
+        OnInPlaceDeactivate();
+        // schedule release of QAxClientSite references that were held by the control
+        CoDisconnectObject(static_cast<IUnknown *>(static_cast<IDispatch *>(this)), 0);
+    }
+
     Q_ASSERT(m_spInPlaceObject == 0);
 }
 
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
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index 97756c3..b3c11db 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -490,10 +490,10 @@ static const char* const type_map[][2] =
     { "QVariant",       "VARIANT" },
     { "QVariantList",    "SAFEARRAY(VARIANT)" },
     { "QList<QVariant>", "SAFEARRAY(VARIANT)" },
-    { "quint64",        "CY" },
-    { "qint64",         "CY" },
-    { "qulonglong",     "CY" },
-    { "qlonglong",      "CY" },
+    { "quint64",        "unsigned hyper" },
+    { "qint64",         "hyper" },
+    { "qulonglong",     "unsigned hyper" },
+    { "qlonglong",      "hyper" },
     { "QByteArray",     "SAFEARRAY(BYTE)" },
     { "QStringList",    "SAFEARRAY(BSTR)" },
     // Userdefined Qt datatypes - some not on Borland though
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 7be78d2..9b7fab8 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -65,6 +65,9 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <qabstractnativeeventfilter.h>
 
+#include <qcoreapplication.h>
+#include <private/qthread_p.h>
+
 #include "qaxfactory.h"
 #include "qaxbindable.h"
 #include "qaxaggregated.h"
@@ -72,6 +75,8 @@
 #include "../shared/qaxtypes.h"
 #include "../shared/qaxutils_p.h"
 
+#include "qclassfactory_p.h"
+
 #if defined Q_CC_GNU
 #   include <w32api.h>
 #endif
@@ -831,182 +836,180 @@ Q_GLOBAL_STATIC(QAxWinEventFilter, qax_winEventFilter);
 
 // COM Factory class, mapping COM requests to ActiveQt requests.
 // One instance of this class for each ActiveX the server can provide.
-class QClassFactory : public IClassFactory2
+QClassFactory::QClassFactory(CLSID clsid)
+    : ref(0), licensed(false)
 {
-public:
-    QClassFactory(CLSID clsid)
-        : ref(0), licensed(false)
-    {
-        InitializeCriticalSection(&refCountSection);
-
-        // COM only knows the CLSID, but QAxFactory is class name based...
-        const QStringList keys = qAxFactory()->featureList();
-        for (const QString &key : keys) {
-            if (qAxFactory()->classID(key) == clsid) {
-                className = key;
-                break;
-            }
-        }
+    InitializeCriticalSection(&refCountSection);
 
-        const QMetaObject *mo = qAxFactory()->metaObject(className);
-        if (mo) {
-            classKey = QLatin1String(mo->classInfo(mo->indexOfClassInfo("LicenseKey")).value());
-            licensed = !classKey.isEmpty();
+    // COM only knows the CLSID, but QAxFactory is class name based...
+    const QStringList keys = qAxFactory()->featureList();
+    for (const QString &key : keys) {
+        if (qAxFactory()->classID(key) == clsid) {
+            className = key;
+            break;
         }
     }
 
-    virtual ~QClassFactory()
-    {
-        DeleteCriticalSection(&refCountSection);
+    const QMetaObject *mo = qAxFactory()->metaObject(className);
+    if (mo) {
+        classKey = QLatin1String(mo->classInfo(mo->indexOfClassInfo("LicenseKey")).value());
+        licensed = !classKey.isEmpty();
     }
+}
 
-    // IUnknown
-    unsigned long WINAPI AddRef()
-    {
-        return InterlockedIncrement(&ref);
-    }
-    unsigned long WINAPI Release()
-    {
-        LONG refCount = InterlockedDecrement(&ref);
-        if (!refCount)
-            delete this;
+QClassFactory::~QClassFactory()
+{
+    DeleteCriticalSection(&refCountSection);
+}
 
-        return refCount;
-    }
-    HRESULT WINAPI QueryInterface(REFIID iid, LPVOID *iface)
-    {
-        *iface = 0;
-        if (iid == IID_IUnknown)
-            *iface = static_cast<IUnknown *>(this);
-        else if (iid == IID_IClassFactory)
-            *iface = static_cast<IClassFactory *>(this);
-        else if (iid == IID_IClassFactory2 && licensed)
-            *iface = static_cast<IClassFactory2 *>(this);
-        else
-            return E_NOINTERFACE;
+// IUnknown
+unsigned long QClassFactory::AddRef()
+{
+    return InterlockedIncrement(&ref);
+}
 
-        AddRef();
-        return S_OK;
-    }
+unsigned long QClassFactory::Release()
+{
+    LONG refCount = InterlockedDecrement(&ref);
+    if (!refCount)
+        delete this;
 
-    HRESULT WINAPI CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, void **ppObject)
-    {
-        if (pUnkOuter) {
-            if (iid != IID_IUnknown)
-                return CLASS_E_NOAGGREGATION;
-            const QMetaObject *mo = qAxFactory()->metaObject(className);
-            if (mo && !qstricmp(mo->classInfo(mo->indexOfClassInfo("Aggregatable")).value(), "no"))
-                return CLASS_E_NOAGGREGATION;
-        }
+    return refCount;
+}
 
-        // Make sure a QApplication instance is present (inprocess case)
-        if (!qApp) {
-            qax_ownQApp = true;
-            int argc = 0;
-            new QApplication(argc, 0);
-        }
-        QGuiApplication::setQuitOnLastWindowClosed(false);
+HRESULT QClassFactory::QueryInterface(REFIID iid, LPVOID *iface)
+{
+    *iface = 0;
+    if (iid == IID_IUnknown)
+        *iface = static_cast<IUnknown *>(this);
+    else if (iid == IID_IClassFactory)
+        *iface = static_cast<IClassFactory *>(this);
+    else if (iid == IID_IClassFactory2 && licensed)
+        *iface = static_cast<IClassFactory2 *>(this);
+    else
+        return E_NOINTERFACE;
 
-        if (qAxOutProcServer)
-            QAbstractEventDispatcher::instance()->installNativeEventFilter(qax_winEventFilter());
-        else
-            QApplication::instance()->d_func()->in_exec = true;
+    AddRef();
+    return S_OK;
+}
 
-        // hook into eventloop; this allows a server to create his own QApplication object
-        if (!qax_hhook && qax_ownQApp) {
-            qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, 0, GetCurrentThreadId());
-        }
+HRESULT QClassFactory::CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, void **ppObject)
+{
+    if (pUnkOuter) {
+        if (iid != IID_IUnknown)
+            return CLASS_E_NOAGGREGATION;
+        const QMetaObject *mo = qAxFactory()->metaObject(className);
+        if (mo && !qstricmp(mo->classInfo(mo->indexOfClassInfo("Aggregatable")).value(), "no"))
+            return CLASS_E_NOAGGREGATION;
+    }
 
-        // If we created QApplication instance, ensure native event loop starts properly
-        // by calling processEvents.
-        if (qax_ownQApp)
-            QCoreApplication::processEvents();
-
-        HRESULT res;
-        // Create the ActiveX wrapper - aggregate if requested
-        if (pUnkOuter) {
-            QAxServerAggregate *aggregate = new QAxServerAggregate(className, pUnkOuter);
-            res = aggregate->QueryInterface(iid, ppObject);
-            if (FAILED(res))
-                delete aggregate;
-        } else {
-            QAxServerBase *activeqt = new QAxServerBase(className, pUnkOuter);
-            res = activeqt->QueryInterface(iid, ppObject);
-            if (FAILED(res))
-                delete activeqt;
-            else
-                activeqt->registerActiveObject((IUnknown*)(IDispatch*)activeqt);
-        }
-        return res;
+    // Make sure a QApplication instance is present (inprocess case)
+    if (!qApp) {
+        qax_ownQApp = true;
+        int argc = 0;
+        new QApplication(argc, 0);
     }
+    QGuiApplication::setQuitOnLastWindowClosed(false);
 
-    // IClassFactory
-    HRESULT WINAPI CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppObject)
-    {
-        // class is licensed
-        if (licensed && !qAxFactory()->validateLicenseKey(className, QString()))
-            return CLASS_E_NOTLICENSED;
+    if (qAxOutProcServer)
+        QAbstractEventDispatcher::instance()->installNativeEventFilter(qax_winEventFilter());
+    else
+        QApplication::instance()->d_func()->in_exec = true;
 
-        return CreateInstanceHelper(pUnkOuter, iid, ppObject);
+    // hook into eventloop; this allows a server to create his own QApplication object
+    if (!qax_hhook && qax_ownQApp) {
+        qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, 0, GetCurrentThreadId());
     }
-    HRESULT WINAPI LockServer(BOOL fLock)
-    {
-        if (fLock)
-            qAxLock();
-        else
-            qAxUnlock();
 
-        return S_OK;
+    // If we created QApplication instance, ensure native event loop starts properly
+    // by calling processEvents.
+    if (qax_ownQApp)
+        QCoreApplication::processEvents();
+
+    HRESULT res;
+    // Create the ActiveX wrapper - aggregate if requested
+    if (pUnkOuter) {
+        QAxServerAggregate *aggregate = new QAxServerAggregate(className, pUnkOuter);
+        res = aggregate->QueryInterface(iid, ppObject);
+        if (FAILED(res))
+            delete aggregate;
+    } else {
+        QAxServerBase *activeqt = new QAxServerBase(className, pUnkOuter);
+        res = activeqt->QueryInterface(iid, ppObject);
+        if (FAILED(res))
+            delete activeqt;
+        else
+            activeqt->registerActiveObject((IUnknown*)(IDispatch*)activeqt);
     }
+    return res;
+}
 
-    // IClassFactory2
-    HRESULT WINAPI RequestLicKey(DWORD, BSTR *pKey)
-    {
-        if (!pKey)
-            return E_POINTER;
-        *pKey = 0;
+// IClassFactory
+HRESULT QClassFactory::CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppObject)
+{
+    // class is licensed
+    if (licensed && !qAxFactory()->validateLicenseKey(className, QString()))
+        return CLASS_E_NOTLICENSED;
 
-        // This of course works only on fully licensed machines
-        if (!qAxFactory()->validateLicenseKey(className, QString()))
-            return CLASS_E_NOTLICENSED;
+    return CreateInstanceHelper(pUnkOuter, iid, ppObject);
+}
 
-        *pKey = QStringToBSTR(classKey);
-        return S_OK;
-    }
+HRESULT QClassFactory::LockServer(BOOL fLock)
+{
+    if (fLock)
+        qAxLock();
+    else
+        qAxUnlock();
 
-    HRESULT WINAPI GetLicInfo(LICINFO *pLicInfo)
-    {
-        if (!pLicInfo)
-            return E_POINTER;
-        pLicInfo->cbLicInfo = sizeof(LICINFO);
+    return S_OK;
+}
 
-        // class specific license key?
-        const QMetaObject *mo = qAxFactory()->metaObject(className);
-        const char *key = mo->classInfo(mo->indexOfClassInfo("LicenseKey")).value();
-        pLicInfo->fRuntimeKeyAvail = key && key[0];
+// IClassFactory2
+HRESULT QClassFactory::RequestLicKey(DWORD, BSTR *pKey)
+{
+    if (!pKey)
+        return E_POINTER;
+    *pKey = 0;
 
-        // machine fully licensed?
-        pLicInfo->fLicVerified = qAxFactory()->validateLicenseKey(className, QString());
+    // This of course works only on fully licensed machines
+    if (!qAxFactory()->validateLicenseKey(className, QString()))
+        return CLASS_E_NOTLICENSED;
 
-        return S_OK;
-    }
+    *pKey = QStringToBSTR(classKey);
+    return S_OK;
+}
 
-    HRESULT WINAPI CreateInstanceLic(IUnknown *pUnkOuter, IUnknown * /* pUnkReserved */, REFIID iid, BSTR bKey, PVOID *ppObject)
-    {
-        QString licenseKey = QString::fromWCharArray(bKey);
-        if (!qAxFactory()->validateLicenseKey(className, licenseKey))
-            return CLASS_E_NOTLICENSED;
-        return CreateInstanceHelper(pUnkOuter, iid, ppObject);
-    }
+HRESULT QClassFactory::GetLicInfo(LICINFO *pLicInfo)
+{
+    if (!pLicInfo)
+        return E_POINTER;
+    pLicInfo->cbLicInfo = sizeof(LICINFO);
 
-    QString className;
+    // class specific license key?
+    const QMetaObject *mo = qAxFactory()->metaObject(className);
+    const char *key = mo->classInfo(mo->indexOfClassInfo("LicenseKey")).value();
+    pLicInfo->fRuntimeKeyAvail = key && key[0];
+
+    // machine fully licensed?
+    pLicInfo->fLicVerified = qAxFactory()->validateLicenseKey(className, QString());
+
+    return S_OK;
+}
+
+HRESULT QClassFactory::CreateInstanceLic(IUnknown *pUnkOuter, IUnknown * /* pUnkReserved */, REFIID iid, BSTR bKey, PVOID *ppObject)
+{
+    QString licenseKey = QString::fromWCharArray(bKey);
+    if (!qAxFactory()->validateLicenseKey(className, licenseKey))
+        return CLASS_E_NOTLICENSED;
+    return CreateInstanceHelper(pUnkOuter, iid, ppObject);
+}
+
+void QClassFactory::cleanupCreatedApplication(QCoreApplication &app)
+{
+    // Cleanup similar to QCoreApplication::exec()
+    app.d_func()->execCleanup();
+}
 
-protected:
-    CRITICAL_SECTION refCountSection;
-    LONG ref;
-    bool licensed;
-    QString classKey;
-};
 
 // Create a QClassFactory object for class \a iid
 HRESULT GetClassObject(REFIID clsid, REFIID iid, void **ppUnk)
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 7117cbb..b0584d5 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -45,6 +45,8 @@
 
 #include <qt_windows.h>
 
+#include "qclassfactory_p.h"
+
 QT_BEGIN_NAMESPACE
 
 bool qax_ownQApp = false;
@@ -111,6 +113,7 @@ STDAPI DllCanUnloadNow()
     if (qax_hhook)
         UnhookWindowsHookEx(qax_hhook);
 
+    QClassFactory::cleanupCreatedApplication(*qApp);
     delete qApp;
     qax_ownQApp = false;
 
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index de1c5a5..e6ddd52 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -43,6 +43,8 @@
 
 #include "qaxfactory.h"
 
+#include <string.h>
+
 #include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE
@@ -173,8 +175,6 @@ bool qax_stopServer()
     return true;
 }
 
-extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &);
-
 QT_END_NAMESPACE
 
 #if defined(QT_NEEDS_QMAIN)
@@ -184,8 +184,47 @@ int qMain(int, char **);
 extern "C" int main(int, char **);
 #endif
 
+static inline QStringList commandLineArguments()
+{
+    QStringList result;
+    int size;
+    if (wchar_t **argv = CommandLineToArgvW(GetCommandLine(), &size)) {
+        result.reserve(size);
+        wchar_t **argvEnd = argv + size;
+        for (wchar_t **a = argv; a < argvEnd; ++a)
+            result.append(QString::fromWCharArray(*a));
+        LocalFree(argv);
+    }
+    return result;
+}
 
-EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nShowCmd)
+static inline bool matchesOption(const QString &arg, const char *option)
+{
+    return (arg.startsWith(QLatin1Char('/')) || arg.startsWith(QLatin1Char('-')))
+        && arg.rightRef(arg.size() - 1).compare(QLatin1String(option), Qt::CaseInsensitive) == 0;
+}
+
+namespace {
+struct Arg {
+    explicit Arg(const QStringList &args)
+    {
+        argv.reserve(args.size() + 1);
+        for (const QString &a : args)
+            argv.append(_strdup(a.toLocal8Bit().constData()));
+        argv.append(nullptr);
+    }
+
+    ~Arg()
+    {
+        for (int i = 0, last = argv.size() - 1; i < last; ++i)
+            free(argv.at(i));
+    }
+
+    QVector<char *> argv;
+};
+} // namespace
+
+EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR, int /* nShowCmd */)
 {
     QT_USE_NAMESPACE
 
@@ -193,47 +232,47 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR,
     GetModuleFileName(0, qAxModuleFilename, MAX_PATH);
     qAxInstance = hInstance;
 
-    QByteArray cmdParam = QString::fromWCharArray(GetCommandLine()).toLocal8Bit();
-    QList<QByteArray> cmds = cmdParam.split(' ');
-    QByteArray unprocessed;
+    const QStringList cmds = commandLineArguments();
+    QStringList unprocessed;
+    unprocessed.reserve(cmds.size());
 
     int nRet = 0;
     bool run = true;
     bool runServer = false;
     for (int i = 0; i < cmds.count(); ++i) {
-        QByteArray cmd = cmds.at(i).toLower();
-        if (cmd == "-activex" || cmd == "/activex" || cmd == "-embedding" || cmd == "/embedding") {
+        const QString &cmd = cmds.at(i);
+        if (matchesOption(cmd, "activex") || matchesOption(cmd, "embedding")) {
             runServer = true;
-        } else if (cmd == "-unregserver" || cmd == "/unregserver") {
+        } else if (matchesOption(cmd, "unregserver")) {
             nRet = UpdateRegistry(false);
             run = false;
             break;
-        } else if (cmd == "-regserver" || cmd == "/regserver") {
+        } else if (matchesOption(cmd, "regserver")) {
             nRet = UpdateRegistry(true);
             run = false;
             break;
-        } else if (cmd == "-dumpidl" || cmd == "/dumpidl") {
+        } else if (matchesOption(cmd, "dumpidl")) {
             ++i;
             if (i < cmds.count()) {
-                QByteArray outfile = cmds.at(i);
+                const QString &outfile = cmds.at(i);
                 ++i;
-                QByteArray version;
-                if (i < cmds.count() && (cmds.at(i) == "-version" || cmds.at(i) == "/version")) {
+                QString version;
+                if (i < cmds.count() && matchesOption(cmds.at(i), "version")) {
                     ++i;
                     if (i < cmds.count())
                         version = cmds.at(i);
                     else
-                        version = "1.0";
+                        version = QStringLiteral("1.0");
                 }
 
-                nRet = DumpIDL(QString::fromLatin1(outfile.constData()), QString::fromLatin1(version.constData()));
+                nRet = DumpIDL(outfile, version);
             } else {
                 qWarning("Wrong commandline syntax: <app> -dumpidl <idl file> [-version <x.y.z>]");
             }
             run = false;
             break;
         } else {
-            unprocessed += cmds.at(i) + ' ';
+            unprocessed.append(cmds.at(i));
         }
     }
 
@@ -255,19 +294,11 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR,
             }
 
             {
-                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);
+                Arg args(unprocessed);
                 qAxInit();
                 if (runServer)
                     QAxFactory::startServer();
-                nRet = ::main(arg.c, arg.v.data());
+                nRet = ::main(args.argv.size() - 1, args.argv.data());
                 QAxFactory::stopServer();
                 qAxCleanup();
             }
diff --git a/src/activeqt/control/qclassfactory_p.h b/src/activeqt/control/qclassfactory_p.h
new file mode 100644
index 0000000..633c6f1
--- /dev/null
+++ b/src/activeqt/control/qclassfactory_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the ActiveQt framework of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCLASSFACTORY_P_H
+#define QCLASSFACTORY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcoreapplication.h>
+#include <ocidl.h>
+
+QT_BEGIN_NAMESPACE
+
+// COM Factory class, mapping COM requests to ActiveQt requests.
+// One instance of this class for each ActiveX the server can provide.
+class QClassFactory : public IClassFactory2
+{
+public:
+    QClassFactory(CLSID clsid);
+
+    virtual ~QClassFactory();
+
+    // IUnknown
+    unsigned long WINAPI AddRef();
+    unsigned long WINAPI Release();
+    HRESULT WINAPI QueryInterface(REFIID iid, LPVOID *iface);
+
+    HRESULT WINAPI CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, void **ppObject);
+
+    // IClassFactory
+    HRESULT WINAPI CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppObject);
+
+    HRESULT WINAPI LockServer(BOOL fLock);
+    // IClassFactory2
+    HRESULT WINAPI RequestLicKey(DWORD, BSTR *pKey);
+
+    HRESULT WINAPI GetLicInfo(LICINFO *pLicInfo);
+
+    HRESULT WINAPI CreateInstanceLic(IUnknown *pUnkOuter, IUnknown * /* pUnkReserved */, REFIID iid, BSTR bKey, PVOID *ppObject);
+
+    static void cleanupCreatedApplication(QCoreApplication &app);
+
+    QString className;
+
+protected:
+    CRITICAL_SECTION refCountSection;
+    LONG ref;
+    bool licensed;
+    QString classKey;
+};
+
+QT_END_NAMESPACE
+
+#endif // QCLASSFACTORY_P_H
diff --git a/sync.profile b/sync.profile
index 78706bf..15b0fdf 100644
--- a/sync.profile
+++ b/sync.profile
@@ -5,13 +5,3 @@
 );
 %classnames = (
 );
-# Module dependencies.
-# Every module that is required to build this module should have one entry.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
-#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
-#
-%dependencies = (
-    "qtbase" => "",
-);