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

Change-Id: Id54a18b587384a7fc0ee23e1c16a3b929be69cbd

27 files changed, 5 insertions, 86 deletions

diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx
index a81afa3..f10cd28 100644
--- a/src/activeqt/axshared.prx
+++ b/src/activeqt/axshared.prx
@@ -7,9 +7,9 @@ MODULE_INCNAME = ActiveQt
 CONFIG += static
 QT += gui-private
 
-LIBS    += -lole32 -loleaut32
-!wince*:LIBS    += -luser32 -lgdi32 -ladvapi32
-win32-g++*:LIBS += -luuid
+LIBS_PRIVATE += -lole32 -loleaut32
+!wince*: LIBS_PRIVATE += -luser32 -lgdi32 -ladvapi32
+win32-g++*: LIBS_PRIVATE += -luuid
 
 HEADERS = \
     shared/qaxtypefunctions.h \
@@ -21,3 +21,4 @@ SOURCES = \
 
 MODULE = axbase
 load(qt_module)
+QMAKE_DOCS_TARGETDIR =   # Make qt_docs.prf default to activeqt instead of qtaxbase
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 1aae1ad..ed54a57 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -44,11 +44,8 @@
 
 #include "qaxobject.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qfile.h>
 #include <qwidget.h>
-
 #include <quuid.h>
 #include <qhash.h>
 #include <qset.h>
@@ -4544,4 +4541,3 @@ void *qax_createObjectWrapper(int metaType, IUnknown *iface)
 */
 
 QT_END_NAMESPACE
-#endif //QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h
index a745b9a..58efb85 100644
--- a/src/activeqt/container/qaxbase.h
+++ b/src/activeqt/container/qaxbase.h
@@ -51,8 +51,6 @@ struct IDispatch;
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QUuid;
 class QAxEventSink;
 class QAxObject;
@@ -227,6 +225,4 @@ Q_DECLARE_METATYPE(IDispatch*)
 
 #endif
 
-#endif // QT_NO_WIN_ACTIVEQT
-
 #endif // QAXBASE_H
diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp
index bd9adab..bad02cb 100644
--- a/src/activeqt/container/qaxdump.cpp
+++ b/src/activeqt/container/qaxdump.cpp
@@ -40,8 +40,6 @@
 
 #include "qaxbase.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qmetaobject.h>
 #include <quuid.h>
 #include <qt_windows.h>
@@ -402,4 +400,3 @@ QString qax_generateDocumentation(QAxBase *that)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp
index 39c80a8..d0b2674 100644
--- a/src/activeqt/container/qaxobject.cpp
+++ b/src/activeqt/container/qaxobject.cpp
@@ -40,8 +40,6 @@
 
 #include "qaxobject.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <quuid.h>
 #include <qmetaobject.h>
 #include <qstringlist.h>
@@ -228,4 +226,3 @@ bool QAxObject::doVerb(const QString &verb)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h
index bbd6e84..8ec2358 100644
--- a/src/activeqt/container/qaxobject.h
+++ b/src/activeqt/container/qaxobject.h
@@ -45,8 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QAxObject : public QObject, public QAxBase
 {
     friend class QAxEventSink;
@@ -93,6 +91,4 @@ template <> inline QAxObject *qobject_cast<QAxObject*>(QObject *o)
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QAxObject*)
 
-#endif // QT_NO_WIN_ACTIVEQT
-
 #endif // QAXOBJECT_H
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 3035ecf..431a82a 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -41,8 +41,6 @@
 #include "qaxscript.h"
 #include "../shared/qaxutils_p.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #if defined(Q_CC_GNU)
 # define QT_NO_QAXSCRIPT
 #elif defined(Q_CC_BOR) && __BORLANDC__ < 0x560
@@ -1296,4 +1294,3 @@ void QAxScriptManager::scriptError(int code, const QString &desc, int spos, cons
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxscript.h b/src/activeqt/container/qaxscript.h
index be71bb3..6885541 100644
--- a/src/activeqt/container/qaxscript.h
+++ b/src/activeqt/container/qaxscript.h
@@ -47,8 +47,6 @@ struct IActiveScript;
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QAxBase;
 class QAxScript;
 class QAxScriptSite;
@@ -238,6 +236,5 @@ inline void QAxScriptManager::addObject(QObject *object)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
 
 #endif // QAXSCRIPT_H
diff --git a/src/activeqt/container/qaxscriptwrapper.cpp b/src/activeqt/container/qaxscriptwrapper.cpp
index db336e2..e9cb031 100644
--- a/src/activeqt/container/qaxscriptwrapper.cpp
+++ b/src/activeqt/container/qaxscriptwrapper.cpp
@@ -40,8 +40,6 @@
 
 #include "qaxobject.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <ActiveQt/qaxfactory.h>
 
 #include <qt_windows.h>
@@ -62,4 +60,3 @@ QAxBase *qax_create_object_wrapper(QObject *object)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index bd1e14c..a6234de 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -40,7 +40,6 @@
 
 #include "qaxselect.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
 #include "ui_qaxselect.h"
 
 #include <QtCore/QSortFilterProxyModel>
@@ -351,4 +350,3 @@ void QAxSelect::onFilterLineEditChanged(const QString &text)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index 228598c..f336679 100644
--- a/src/activeqt/container/qaxselect.h
+++ b/src/activeqt/container/qaxselect.h
@@ -44,8 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QAxSelectPrivate;
 class QModelIndex;
 
@@ -67,6 +65,5 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
 
 #endif // QAXSELECT_H
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 9b3272e..88f3da9 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -41,8 +41,6 @@
 #include "qaxwidget.h"
 #include "../shared/qaxutils_p.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <ActiveQt/qaxaggregated.h>
 
 #include <qabstracteventdispatcher.h>
@@ -2307,4 +2305,3 @@ bool QAxWidget::translateKeyEvent(int message, int keycode) const
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index b889cd1..a4ca3f9 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -46,8 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QAxHostWindow;
 class QAxAggregated;
 
@@ -115,6 +113,5 @@ template <> inline QAxWidget *qobject_cast<QAxWidget*>(QObject *o)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
 
 #endif // QAXWIDGET_H
diff --git a/src/activeqt/control/qaxaggregated.h b/src/activeqt/control/qaxaggregated.h
index 99b7710..5fdc9df 100644
--- a/src/activeqt/control/qaxaggregated.h
+++ b/src/activeqt/control/qaxaggregated.h
@@ -47,8 +47,6 @@ struct IUnknown;
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QUuid;
 
 class QAxAggregated
@@ -81,8 +79,6 @@ private:
     ULONG WINAPI AddRef() {return controllingUnknown()->AddRef(); } \
     ULONG WINAPI Release() {return controllingUnknown()->Release(); } \
 
-#endif // QT_NO_WIN_ACTIVEQT
-
 QT_END_NAMESPACE
 
 #endif // QAXAGGREGATED_H
diff --git a/src/activeqt/control/qaxbindable.cpp b/src/activeqt/control/qaxbindable.cpp
index ffcd15a..291cec0 100644
--- a/src/activeqt/control/qaxbindable.cpp
+++ b/src/activeqt/control/qaxbindable.cpp
@@ -40,8 +40,6 @@
 
 #include "qaxbindable.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qmetaobject.h>
 
 #include <qt_windows.h> // for IUnknown
@@ -322,4 +320,3 @@ bool QAxBindable::writeData(QIODevice *sink)
 */
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h
index 81e642f..ebc6452 100644
--- a/src/activeqt/control/qaxbindable.h
+++ b/src/activeqt/control/qaxbindable.h
@@ -47,8 +47,6 @@ struct IUnknown;
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QAxAggregated;
 class QIODevice;
 struct IAxServerBase;
@@ -77,6 +75,5 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
 
 #endif // QAXBINDABLE_H
diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp
index dd2e7d3..2a4184f 100644
--- a/src/activeqt/control/qaxfactory.cpp
+++ b/src/activeqt/control/qaxfactory.cpp
@@ -40,8 +40,6 @@
 
 #include "qaxfactory.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qmetaobject.h>
@@ -590,4 +588,3 @@ bool QAxFactory::registerActiveObject(QObject *object)
 */
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h
index 115997a..8cf385c 100644
--- a/src/activeqt/control/qaxfactory.h
+++ b/src/activeqt/control/qaxfactory.h
@@ -52,8 +52,6 @@ struct IDispatch;
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 class QWidget;
 class QSettings;
 
@@ -303,6 +301,4 @@ Q_DECLARE_METATYPE(IDispatch*)
 
 #endif
 
-#endif // QT_NO_WIN_ACTIVEQT
-
 #endif // QAXFACTORY_H
diff --git a/src/activeqt/control/qaxmain.cpp b/src/activeqt/control/qaxmain.cpp
index dcd38e4..8dafaf0 100644
--- a/src/activeqt/control/qaxmain.cpp
+++ b/src/activeqt/control/qaxmain.cpp
@@ -41,8 +41,6 @@
 #include <qapplication.h>
 #include <qaxfactory.h>
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 int main(int argc, char **argv)
 {
     QT_USE_NAMESPACE
@@ -52,4 +50,3 @@ int main(int argc, char **argv)
 
     return app.exec();
 }
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index b8b2f5f..97a7446 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -41,8 +41,6 @@
 #include "qaxbindable.h"
 #include "qaxfactory.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qdir.h>
@@ -1259,4 +1257,3 @@ ErrorInClass:
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 00402dc..5bc61dc 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -41,8 +41,6 @@
 #define QT_NO_CAST_TO_ASCII
 #define NOMINMAX
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qabstracteventdispatcher.h>
 #include <qapplication.h>
 #include <qbuffer.h>
@@ -4376,4 +4374,3 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 9a6a6b3..39f58e9 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qapplication.h>
 #include <qwidget.h>
 
@@ -136,4 +134,3 @@ EXTERN_C BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /* lpvR
 }
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index de86ed6..fd8dc63 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -43,8 +43,6 @@
 
 #include "qaxfactory.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE
@@ -271,5 +269,3 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR,
     
     return nRet;
 }
-
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf
index db17ad7..79c0d20 100644
--- a/src/activeqt/doc/activeqt.qdocconf
+++ b/src/activeqt/doc/activeqt.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = ActiveQt
 description             = ActiveQt
-url                     = http://qt-project.org/doc/qt-$QT_VER/activeqt
+url                     = http://qt-project.org/doc/qt-$QT_VER
 version                 = $QT_VERSION
 
 examplesinstallpath     =
diff --git a/src/activeqt/shared/qaxtypefunctions.h b/src/activeqt/shared/qaxtypefunctions.h
index 59968c2..78ede68 100644
--- a/src/activeqt/shared/qaxtypefunctions.h
+++ b/src/activeqt/shared/qaxtypefunctions.h
@@ -51,8 +51,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 extern GUID IID_IAxServerBase;
 struct IAxServerBase : public IUnknown
 {
@@ -87,6 +85,4 @@ extern void clearVARIANT(VARIANT *var);
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_WIN_ACTIVEQT
-
 #endif // QAXTYPEFUNCTIONS_P_H
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 060d374..af14a29 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -46,8 +46,6 @@
 #include "qaxtypes.h"
 #include "qaxutils_p.h"
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #include <qcursor.h>
 #include <qpixmap.h>
 #include <qpainter.h>
@@ -1311,5 +1309,3 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_WIN_ACTIVEQT
diff --git a/src/activeqt/shared/qaxtypes.h b/src/activeqt/shared/qaxtypes.h
index f3b0da1..9c572a6 100644
--- a/src/activeqt/shared/qaxtypes.h
+++ b/src/activeqt/shared/qaxtypes.h
@@ -45,8 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_WIN_ACTIVEQT
-
 #ifdef QAX_SERVER
 #   define QVariantToVARIANTFunc QVariantToVARIANT_server
 #   define VARIANTToQVariantFunc VARIANTToQVariant_server
@@ -72,6 +70,5 @@ inline QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName
 #undef VARIANTToQVariantFunc
 
 QT_END_NAMESPACE
-#endif // QT_NO_WIN_ACTIVEQT
 
 #endif // QAXTYPES_H