Cleanup

38 files changed, 18 insertions, 125 deletions

diff --git a/src/declarative/3rdparty/qlistmodelinterface_p.h b/src/declarative/3rdparty/qlistmodelinterface_p.h
index 44c4a24..738378e 100644
--- a/src/declarative/3rdparty/qlistmodelinterface_p.h
+++ b/src/declarative/3rdparty/qlistmodelinterface_p.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QVariant>
-#include <QtDeclarative/qfxglobal.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qmlgraphicsanchors_p.h b/src/declarative/fx/qmlgraphicsanchors_p.h
index 6c76cd3..f6e9e1a 100644
--- a/src/declarative/fx/qmlgraphicsanchors_p.h
+++ b/src/declarative/fx/qmlgraphicsanchors_p.h
@@ -43,7 +43,6 @@
 #define QMLGRAPHICSANCHORS_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlgraphicsitem.h>
 
diff --git a/src/declarative/fx/qmlgraphicseffects.cpp b/src/declarative/fx/qmlgraphicseffects.cpp
index 8467dd7..c611eea 100644
--- a/src/declarative/fx/qmlgraphicseffects.cpp
+++ b/src/declarative/fx/qmlgraphicseffects.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 #include <qml.h>
-#include <qfxglobal.h>
 #include <QtGui/qgraphicseffect.h>
 
 QML_DECLARE_TYPE(QGraphicsEffect)
diff --git a/src/declarative/fx/qmlgraphicsevents_p_p.h b/src/declarative/fx/qmlgraphicsevents_p_p.h
index e38446f..9cab18e 100644
--- a/src/declarative/fx/qmlgraphicsevents_p_p.h
+++ b/src/declarative/fx/qmlgraphicsevents_p_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
diff --git a/src/declarative/fx/qmlgraphicsitem.h b/src/declarative/fx/qmlgraphicsitem.h
index 5f14751..bdfc245 100644
--- a/src/declarative/fx/qmlgraphicsitem.h
+++ b/src/declarative/fx/qmlgraphicsitem.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlcomponent.h>
 #include <QtGui/qgraphicsitem.h>
diff --git a/src/declarative/fx/qmlgraphicspainteditem_p.h b/src/declarative/fx/qmlgraphicspainteditem_p.h
index 10b80a4..99873a7 100644
--- a/src/declarative/fx/qmlgraphicspainteditem_p.h
+++ b/src/declarative/fx/qmlgraphicspainteditem_p.h
@@ -42,7 +42,6 @@
 #ifndef QMLGRAPHICSIMAGEITEM_H
 #define QMLGRAPHICSIMAGEITEM_H
 
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qmlgraphicsitem.h>
 
 
diff --git a/src/declarative/fx/qmlgraphicspixmapcache_p.h b/src/declarative/fx/qmlgraphicspixmapcache_p.h
index 261d3a1..29de98d 100644
--- a/src/declarative/fx/qmlgraphicspixmapcache_p.h
+++ b/src/declarative/fx/qmlgraphicspixmapcache_p.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/QString>
 #include <QtGui/QPixmap>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qurl.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qmlgraphicsscalegrid_p_p.h b/src/declarative/fx/qmlgraphicsscalegrid_p_p.h
index b4167c5..b66a5a5 100644
--- a/src/declarative/fx/qmlgraphicsscalegrid_p_p.h
+++ b/src/declarative/fx/qmlgraphicsscalegrid_p_p.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
-#include <QtDeclarative/qfxglobal.h>
 #include <private/qmlgraphicspixmapcache_p.h>
 #include <QtDeclarative/qml.h>
 #include "qmlgraphicsborderimage_p.h"
diff --git a/src/declarative/fx/qmlgraphicswebview_p.h b/src/declarative/fx/qmlgraphicswebview_p.h
index 8b8e4ec..6852bb0 100644
--- a/src/declarative/fx/qmlgraphicswebview_p.h
+++ b/src/declarative/fx/qmlgraphicswebview_p.h
@@ -44,7 +44,6 @@
 
 #include <QtGui/QAction>
 #include <QtCore/QUrl>
-#include <QtDeclarative/qfxglobal.h>
 #include <private/qmlgraphicspainteditem_p.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWebKit/QWebPage>
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 43351b3..f6a6371 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -46,7 +46,6 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlmetaproperty.h>
 #include <QtDeclarative/qmlparserstatus.h>
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 4c02f95..ee13437 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -49,6 +49,7 @@ SOURCES += qml/qmlparser.cpp \
     qml/qmllistscriptclass.cpp
 
 HEADERS += qml/qmlparser_p.h \
+    qml/qmlglobal_p.h \
     qml/qmlinstruction_p.h \
     qml/qmlvmemetaobject_p.h \
     qml/qml.h \
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index 28e328b..b3bcf42 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -49,6 +49,7 @@
 #include <private/qmlrefcount_p.h>
 #include <private/qmljsast_p.h>
 #include <private/qmljsengine_p.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index 7af276b..8814e77 100644
--- a/src/declarative/qml/qmlbinding.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -43,7 +43,6 @@
 #define QMLBINDING_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlpropertyvaluesource.h>
 #include <QtDeclarative/qmlexpression.h>
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index bbce366..def11c3 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -44,11 +44,11 @@
 #include "private/qmlengine_p.h"
 #include "private/qmlexpression_p.h"
 #include "private/qmlcontext_p.h"
-#include <qfxglobal.h>
 #include <qmlmetatype.h>
 #include <qml.h>
 #include <qmlcontext.h>
-#include <QDebug>
+#include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 473009d..b93a9b3 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -70,6 +70,7 @@
 #include "qmlmetaproperty_p.h"
 #include "qmlrewrite_p.h"
 #include <QtDeclarative/qmlscriptstring.h>
+#include <private/qmlglobal_p.h>
 
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 116fd4b..03f07b3 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -56,6 +56,7 @@
 #include <QtCore/qdebug.h>
 #include <QApplication>
 #include <private/qmlbinding_p.h>
+#include <private/qmlglobal_p.h>
 
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index bd72f20..bfb4d53 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -45,7 +45,6 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlerror.h>
 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index a3697a7..89d3be2 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -55,7 +55,6 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlerror.h>
 #include <private/qmlparser_p.h>
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 46a7a5a..b6e794b 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -48,6 +48,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include "qmlscriptparser_p.h"
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0f8b98a..07296d9 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -87,6 +87,7 @@
 #include <private/qmltypenamescriptclass_p.h>
 #include <private/qmllistscriptclass_p.h>
 #include <QtDeclarative/qmlscriptstring.h>
+#include <private/qmlglobal_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include "qt_windows.h"
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index f8954d5..15e4fdf 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qfxglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
index ba44ce18..ce4ac1e 100644
--- a/src/declarative/qml/qmlmetaproperty.h
+++ b/src/declarative/qml/qmlmetaproperty.h
@@ -42,8 +42,7 @@
 #ifndef QMLMETAPROPERTY_H
 #define QMLMETAPROPERTY_H
 
-#include <QtDeclarative/qfxglobal.h>
-#include <QtCore/QMetaProperty>
+#include <QtCore/qmetaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
index 1f011c2..b86f2f2 100644
--- a/src/declarative/qml/qmlrewrite.cpp
+++ b/src/declarative/qml/qmlrewrite.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qmlrewrite_p.h"
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h
deleted file mode 100644
index eb57963..0000000
--- a/src/declarative/util/qfxglobal.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFXGLOBAL_H
-#define QFXGLOBAL_H
-
-#include <QtCore/qglobal.h>
-#include <QtCore/QObject>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-#define QFX_CONFIGURATION_SOFTWARE
-#define QFX_RENDER_QPAINTER
-
-#define DEFINE_BOOL_CONFIG_OPTION(name, var) \
-    static bool name() \
-    { \
-        static enum { Yes, No, Unknown } status = Unknown; \
-        if (status == Unknown) { \
-            QByteArray v = qgetenv(#var); \
-            bool value = !v.isEmpty() && v != "0" && v != "false"; \
-            if (value) status = Yes; \
-            else status = No; \
-        } \
-        return status == Yes; \
-    }
-
-struct QmlGraphics_DerivedObject : public QObject
-{
-    void setParent_noEvent(QObject *parent) {
-        bool sce = d_ptr->sendChildEvents;
-        d_ptr->sendChildEvents = false;
-        setParent(parent);
-        d_ptr->sendChildEvents = sce;
-    }
-};
-
-/*!
-    Makes the \a object a child of \a parent.  Note that when using this method,
-    neither \a parent nor the object's previous parent (if it had one) will
-    receive ChildRemoved or ChildAdded events.
-*/
-inline void QmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
-{
-    static_cast<QmlGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QFXGLOBAL_H
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 47d7146..180864c 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -58,6 +58,7 @@
 #include <private/qmlstateoperations_p.h>
 #include <private/qmlstringconverters_p.h>
 #include <private/qvariantanimation_p.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h
index a4ba81d..c3118a3 100644
--- a/src/declarative/util/qmlbind_p.h
+++ b/src/declarative/util/qmlbind_p.h
@@ -42,7 +42,6 @@
 #ifndef QMLBIND_H
 #define QMLBIND_H
 
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qobject.h>
 #include <QtDeclarative/qml.h>
 
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index ff6521c..8676024 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -47,7 +47,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QVariant>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <private/qlistmodelinterface_p.h>
 #include <QtScript/qscriptvalue.h>
diff --git a/src/declarative/util/qmlpropertymap_p.h b/src/declarative/util/qmlpropertymap_p.h
index 0f641b2..bb397fe 100644
--- a/src/declarative/util/qmlpropertymap_p.h
+++ b/src/declarative/util/qmlpropertymap_p.h
@@ -42,7 +42,6 @@
 #ifndef QMLPROPERTYMAP_H
 #define QMLPROPERTYMAP_H
 
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h
index cadb344..b81539a 100644
--- a/src/declarative/util/qmlspringfollow_p.h
+++ b/src/declarative/util/qmlspringfollow_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLFOLLOW_H
-#define QMLFOLLOW_H
+#ifndef QMLSMOOTHFOLLOW_H
+#define QMLSMOOTHFOLLOW_H
 
 #include <QtDeclarative/qmlpropertyvaluesource.h>
 #include <QtDeclarative/qml.h>
@@ -110,4 +110,4 @@ QML_DECLARE_TYPE(QmlSpringFollow)
 
 QT_END_HEADER
 
-#endif // QFXFOLLOW_H
+#endif // QMLSMOOTHFOLLOW_H
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index a5978a5..ce4b540 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -48,6 +48,7 @@
 #include "qmlanimation_p_p.h"
 #include "qmlstate_p.h"
 #include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 9d18390..92aef8c 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/QSequentialAnimationGroup>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index cff25c3..f518ea5 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -44,6 +44,7 @@
 #include "qmltransition_p.h"
 #include <QtDeclarative/qmlbinding.h>
 #include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmltimeline_p_p.h b/src/declarative/util/qmltimeline_p_p.h
index f1e716c..09d46ba 100644
--- a/src/declarative/util/qmltimeline_p_p.h
+++ b/src/declarative/util/qmltimeline_p_p.h
@@ -55,7 +55,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QAbstractAnimation>
-#include <QtDeclarative/qfxglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h
index 7d40d5a..f3037e0 100644
--- a/src/declarative/util/qmltimer_p.h
+++ b/src/declarative/util/qmltimer_p.h
@@ -42,7 +42,6 @@
 #ifndef QMLTIMER_H
 #define QMLTIMER_H
 
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractanimation.h>
 #include <QtDeclarative/qml.h>
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index de1d3e8..a7c709f 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -43,7 +43,6 @@
 #define QMLTRANSITION_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <private/qmlstate_p.h>
 #include <QtDeclarative/qml.h>
 
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 27a4bba..0a2cc75 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -62,6 +62,7 @@
 #include <private/qmldebug_p.h>
 #include <private/qmldebugservice_p.h>
 #include <QtCore/qabstractanimation.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
index 08c036d..08d69bc 100644
--- a/src/declarative/util/qmlview.h
+++ b/src/declarative/util/qmlview.h
@@ -46,7 +46,6 @@
 #include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/qgraphicsview.h>
 #include <QtGui/qwidget.h>
-#include <QtDeclarative/qfxglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index a60613e..87ccb58 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -25,7 +25,6 @@ SOURCES += \
 HEADERS += \
            util/qmlview.h \
            util/qfxperf_p_p.h \
-           util/qfxglobal.h \
            util/qperformancelog_p_p.h \
            util/qmlconnection_p.h \
            util/qmlpackage_p.h \