11 files changed, 10 insertions, 67 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index a0ea68c..36d87e2 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -128,22 +128,6 @@ namespace QT_NAMESPACE {}
 
 #endif /* __cplusplus */
 
-/**
- * For animation framework to work seamlessly as a solution
- */
-#if 0
-# define QT_EXPERIMENTAL_BEGIN_NAMESPACE namespace QtExperimental {
-# define QT_EXPERIMENTAL_END_NAMESPACE }
-# define QT_EXPERIMENTAL_USE_NAMESPACE using namespace QtExperimental;
-# define QT_EXPERIMENTAL_PREPEND_NAMESPACE(name) QtExperimental::name
-namespace QtExperimental {}
-#else
-# define QT_EXPERIMENTAL_BEGIN_NAMESPACE
-# define QT_EXPERIMENTAL_END_NAMESPACE
-# define QT_EXPERIMENTAL_USE_NAMESPACE
-# define QT_EXPERIMENTAL_PREPEND_NAMESPACE(name) name
-#endif
-
 #if defined(Q_OS_MAC) && !defined(Q_CC_INTEL)
 #define QT_BEGIN_HEADER extern "C++" {
 #define QT_END_HEADER }
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 314dd7c..48c9232 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -45,8 +45,6 @@
 #include <QtCore/qeasingcurve.h>
 #include <QtCore/qobject.h>
 
-QT_EXPERIMENTAL_USE_NAMESPACE
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index 05195b6..65fd219 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -59,7 +59,6 @@ class QGraphicsLayout;
 class QGraphicsSceneMoveEvent;
 class QGraphicsWidgetPrivate;
 class QGraphicsSceneResizeEvent;
-class QGraphicsWidgetAnimator;
 class QStyle;
 class QStyleOption;
 
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 7f515cd..fe89f81 100644
--- a/src/gui/statemachine/qbasickeyeventtransition.cpp
+++ b/src/gui/statemachine/qbasickeyeventtransition.cpp
@@ -12,13 +12,7 @@
 #include "qbasickeyeventtransition_p.h"
 #include <QtGui/qevent.h>
 #include <qdebug.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition_p.h"
-#else
-# include <private/qabstracttransition_p.h>
-#endif
-
+#include <private/qabstracttransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/gui/statemachine/qbasickeyeventtransition_p.h
index 7506747..c4ff863 100644
--- a/src/gui/statemachine/qbasickeyeventtransition_p.h
+++ b/src/gui/statemachine/qbasickeyeventtransition_p.h
@@ -23,12 +23,7 @@
 // We mean it.
 //
 
-// Qt
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition.h"
-#else
-# include <QtCore/qabstracttransition.h>
-#endif
+#include <QtCore/qabstracttransition.h>
 #include <QtGui/qevent.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/gui/statemachine/qbasicmouseeventtransition.cpp
index 42b7580..a18d1e8 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition.cpp
+++ b/src/gui/statemachine/qbasicmouseeventtransition.cpp
@@ -13,12 +13,7 @@
 #include <QtGui/qevent.h>
 #include <QtGui/qpainterpath.h>
 #include <qdebug.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition_p.h"
-#else
-# include <private/qabstracttransition_p.h>
-#endif
+#include <private/qabstracttransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h
index 57f83c6..6a3ad1e 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h
@@ -23,12 +23,7 @@
 // We mean it.
 //
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition.h"
-#else
-# include <QtCore/qabstracttransition.h>
-#endif
-
+#include <QtCore/qabstracttransition.h>
 #include <QtGui/qevent.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index 3cf51a3..0418501 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -12,12 +12,7 @@
 #include "qkeyeventtransition.h"
 #include "qbasickeyeventtransition_p.h"
 #include <QtCore/qwrappedevent.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition_p.h"
-#else
-# include <private/qeventtransition_p.h>
-#endif
+#include <private/qeventtransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index 08595e8..08c4800 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -12,11 +12,8 @@
 #ifndef QKEYEVENTTRANSITION_H
 #define QKEYEVENTTRANSITION_H
 
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition.h"
-#else
-# include <QtCore/qeventtransition.h>
-#endif
+#include <QtCore/qeventtransition.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/gui/statemachine/qmouseeventtransition.cpp
index 5ffdab0..ae3c407 100644
--- a/src/gui/statemachine/qmouseeventtransition.cpp
+++ b/src/gui/statemachine/qmouseeventtransition.cpp
@@ -13,12 +13,7 @@
 #include "qbasicmouseeventtransition_p.h"
 #include <QtCore/qwrappedevent.h>
 #include <QtGui/qpainterpath.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition_p.h"
-#else
-# include <private/qeventtransition_p.h>
-#endif
+#include <private/qeventtransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index e878a58..aedc5c2 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -12,12 +12,8 @@
 #ifndef QMOUSEEVENTTRANSITION_H
 #define QMOUSEEVENTTRANSITION_H
 
-//Qt
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition.h"
-#else
-# include <QtCore/qeventtransition.h>
-#endif
+#include <QtCore/qeventtransition.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE