Merge remote-tracking branch 'origin/release' into stable

Change-Id: Icf07a52714047b64da742762dff1b25346a313a9

.qmake.conf

 load(qt_build_config)
 CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.0.2

src/activeqt/container/container.pro

@@ -9,7 +9,8 @@ HEADERS =   ../control/qaxaggregated.h \
             qaxobject.h \
             qaxscript.h \
             qaxselect.h \
-            ../shared/qaxtypes.h
+            ../shared/qaxtypes.h \
+            ../shared/qaxutils_p.h
 
 SOURCES =   qaxbase.cpp \
             qaxdump.cpp \
@@ -18,7 +19,8 @@ SOURCES =   qaxbase.cpp \
             qaxscript.cpp \
             qaxscriptwrapper.cpp \
             qaxselect.cpp \
-            ../shared/qaxtypes.cpp
+            ../shared/qaxtypes.cpp \
+            ../shared/qaxutils.cpp
 
 FORMS =     qaxselect.ui