Merge branch 'stable' into release

Change-Id: If66343daf53d9a5fc6eebd67b1c5dcfd7d219f55

5 files changed, 74 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 990859d..ecf2b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,3 +257,6 @@ src/xml/lib/
 *.dep
 *.map
 work
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 0000000..e1c4756
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,61 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+AxContainer
+-----------
+
+QAxServer
+---------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro
index 7541304..dfe86ea 100644
--- a/src/activeqt/control/control.pro
+++ b/src/activeqt/control/control.pro
@@ -21,7 +21,7 @@ SOURCES =   qaxserver.cpp \
 
 MODULE = axserver
 MODULE_DEFINES = QAXSERVER
-MODULE_CONFIG = idcidl
+MODULE_CONFIG = idcidl force_import_plugins
 CONFIG  += no_module_headers
 load(qt_module)
 DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index aca14c3..73a7679 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -878,6 +878,11 @@ public:
             qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, 0, GetCurrentThreadId());
         }
 
+        // If we created QApplication instance, ensure native event loop starts properly
+        // by calling processEvents.
+        if (qax_ownQApp)
+            qApp->processEvents();
+
 	HRESULT res;
 	// Create the ActiveX wrapper - aggregate if requested
 	if (pUnkOuter) {
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf
index d004c1f..32dca1e 100644
--- a/src/activeqt/doc/activeqt.qdocconf
+++ b/src/activeqt/doc/activeqt.qdocconf
@@ -3,7 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = ActiveQt
 description             = ActiveQt
 url                     = http://qt-project.org/doc/activeqt
-version                 = 5.0.0
+version                 = 5.0.1
 
 examplesinstallpath     =
 
@@ -15,9 +15,9 @@ qhp.ActiveQt.virtualFolder       = activeqt
 qhp.ActiveQt.indexTitle          = Active Qt
 qhp.ActiveQt.indexRoot           =
 
-qhp.ActiveQt.filterAttributes    = activeqt 5.0.0 qtrefdoc
-qhp.ActiveQt.customFilters.Qt.name = activeqt 5.0.0
-qhp.ActiveQt.customFilters.Qt.filterAttributes = activeqt 5.0.0
+qhp.ActiveQt.filterAttributes    = activeqt 5.0.1 qtrefdoc
+qhp.ActiveQt.customFilters.Qt.name = activeqt 5.0.1
+qhp.ActiveQt.customFilters.Qt.filterAttributes = activeqt 5.0.1
 
 qhp.ActiveQt.subprojects         = qaxcontainerclasses qaxserverclasses
 qhp.ActiveQt.subprojects.qaxcontainerclasses.title = QAxContainer C++ Classes