diff options
16 files changed, 36 insertions, 29 deletions
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp index c47df32..ce396fd 100644 --- a/src/declarative/qml/qdeclarativeboundsignal.cpp +++ b/src/declarative/qml/qdeclarativeboundsignal.cpp @@ -45,7 +45,7 @@ #include "qdeclarativeengine_p.h" #include "qdeclarativeexpression_p.h" #include "qdeclarativecontext_p.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" #include "qdeclarativeglobal_p.h" diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index b6ebd60..9ac65f9 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -51,7 +51,7 @@ #include "qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarativecustomparser_p_p.h" #include "qdeclarativecontext_p.h" #include "qdeclarativecomponent_p.h" diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index cef1f3c..99587a8 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarativeerror.h" #include "qdeclarativeparser_p.h" diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 39b8a22..3229570 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -68,6 +68,7 @@ #include "qdeclarativedirparser_p.h" #include "qdeclarativeextensioninterface.h" #include "qdeclarativelist_p.h" +#include "qdeclarativetypenamecache_p.h" #include <qfxperf_p_p.h> @@ -1503,9 +1504,6 @@ QDeclarativeEnginePrivate::Imports::~Imports() delete d; } -#include "qdeclarativemetatype.h" -#include "qdeclarativetypenamecache_p.h" - static QDeclarativeTypeNameCache *cacheForNamespace(QDeclarativeEngine *engine, const QDeclarativeEnginePrivate::ImportedNamespace &set, QDeclarativeTypeNameCache *cache) { if (!cache) @@ -1667,6 +1665,7 @@ QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString const QStringList &suffixes, const QString &prefix) { + qWarning() << baseName; foreach (const QString &suffix, suffixes) { QString pluginFileName = prefix; diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 1a858d4..c4a40c5 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -67,7 +67,7 @@ #include "qdeclarativeobjectscriptclass_p.h" #include "qdeclarativecontextscriptclass_p.h" #include "qdeclarativevaluetypescriptclass_p.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include <QtScript/QScriptClass> #include <QtScript/QScriptValue> diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index e4579a6..6a81e52 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -43,7 +43,7 @@ #include "qdeclarativeboundsignal_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarativemetaproperty.h" #include "qdeclarativebinding_p.h" #include "qdeclarativecontext_p.h" diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index 41d09c4..7dc61fd 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -43,7 +43,7 @@ #include "qdeclarativedeclarativedata_p.h" #include "qdeclarativecontext.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include <QCoreApplication> diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp index 7fa4b0c..8fa210f 100644 --- a/src/declarative/qml/qdeclarativeintegercache.cpp +++ b/src/declarative/qml/qdeclarativeintegercache.cpp @@ -42,7 +42,7 @@ #include "qdeclarativeintegercache_p.h" #include "qdeclarativeengine_p.h" -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 7ae5a83..e87f8ba 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativemetatype.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarativeproxymetaobject_p.h" #include "qdeclarativecustomparser_p.h" diff --git a/src/declarative/qml/qdeclarativemetatype.h b/src/declarative/qml/qdeclarativemetatype_p.h index 4cddf1c..ec5c045 100644 --- a/src/declarative/qml/qdeclarativemetatype.h +++ b/src/declarative/qml/qdeclarativemetatype_p.h @@ -39,21 +39,28 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEMETATYPE_H -#define QDECLARATIVEMETATYPE_H - -#include "qdeclarativeprivate.h" +#ifndef QDECLARATIVEMETATYPE_P_H +#define QDECLARATIVEMETATYPE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qdeclarative.h" #include <QtCore/qglobal.h> #include <QtCore/qvariant.h> #include <QtCore/qbitarray.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeType; class QDeclarativeCustomParser; class Q_DECLARATIVE_EXPORT QDeclarativeMetaType @@ -138,7 +145,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - -#endif // QDECLARATIVEMETATYPE_H +#endif // QDECLARATIVEMETATYPE_P_H diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 8285bb9..8a43cec 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -80,7 +80,7 @@ HEADERS += \ $$PWD/qdeclarativedom_p.h \ $$PWD/qdeclarativedom_p_p.h \ $$PWD/qdeclarativerefcount_p.h \ - $$PWD/qdeclarativemetatype.h \ + $$PWD/qdeclarativemetatype_p.h \ $$PWD/qdeclarativeengine.h \ $$PWD/qdeclarativecontext.h \ $$PWD/qdeclarativeexpression.h \ diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 88b64fd..eb3a376 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -51,7 +51,7 @@ #include <qdeclarativeexpression.h> #include <qdeclarativestringconverters_p.h> #include <qdeclarativeglobal_p.h> -#include <qdeclarativemetatype.h> +#include <qdeclarativemetatype_p.h> #include <qvariant.h> #include <qcolor.h> diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index 346f3e4..4e56909 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -41,9 +41,9 @@ #include "qdeclarativelistaccessor_p.h" -#include <qdeclarativemetatype.h> +#include <qdeclarativemetatype_p.h> -#include <QStringList> +#include <QtCore/qstringlist.h> #include <QtCore/qdebug.h> // ### Remove me diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 1c8cbbc..40cd737 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -49,7 +49,6 @@ #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeexpression.h> -#include <QtDeclarative/qdeclarativemetatype.h> #include <QtDeclarative/qdeclarativemetaproperty.h> #include <private/qdeclarativebinding_p.h> @@ -58,6 +57,7 @@ #include <private/qdeclarativedebugclient_p.h> #include <private/qdeclarativedebugservice_p.h> #include <private/qdeclarativerectangle_p.h> +#include <private/qdeclarativemetatype_p.h> #include "../shared/debugutil_p.h" diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 16af0d9..ae07112 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -41,12 +41,14 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qdeclarativemetatype.h> #include <QtCore/qfile.h> #include <QtCore/qdebug.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> + #include <private/qdeclarativemetaproperty_p.h> +#include <private/qdeclarativemetatype_p.h> + #include "testtypes.h" #include "../../../shared/util.h" diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index ca16214..4333e02 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include <qtest.h> -#include <QDeclarativeMetaType> #include <QLocale> #include <QPixmap> #include <QBitmap> @@ -53,6 +52,8 @@ #include <QQuaternion> #include <qdeclarative.h> +#include <private/qdeclarativemetatype_p.h> + class tst_qdeclarativemetatype : public QObject { Q_OBJECT |