12 files changed, 0 insertions, 38 deletions
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