Namespace clean-ups.

src/plugins/qmleditor/qmlcodecompletion.cpp

@@ -42,7 +42,7 @@
 using namespace QmlEditor;
 using namespace QmlEditor::Internal;
 
-QmlCodeCompletion::QmlCodeCompletion(QmlModelManagerInterface *modelManager, Qml::MetaType::QmlTypeSystem *typeSystem, QObject *parent)
+QmlCodeCompletion::QmlCodeCompletion(QmlModelManagerInterface *modelManager, Qml::QmlTypeSystem *typeSystem, QObject *parent)
     : TextEditor::ICompletionCollector(parent),
       m_modelManager(modelManager),
       m_editor(0),

src/plugins/qmleditor/qmlcodecompletion.h

@@ -19,7 +19,7 @@ class QmlCodeCompletion: public TextEditor::ICompletionCollector
     Q_OBJECT
 
 public:
-    QmlCodeCompletion(QmlModelManagerInterface *modelManager, Qml::MetaType::QmlTypeSystem *typeSystem, QObject *parent = 0);
+    QmlCodeCompletion(QmlModelManagerInterface *modelManager, Qml::QmlTypeSystem *typeSystem, QObject *parent = 0);
     virtual ~QmlCodeCompletion();
 
     Qt::CaseSensitivity caseSensitivity() const;
@@ -39,7 +39,7 @@ private:
     int m_startPosition;
     QList<TextEditor::CompletionItem> m_completions;
     Qt::CaseSensitivity m_caseSensitivity;
-    Qml::MetaType::QmlTypeSystem *m_typeSystem;
+    Qml::QmlTypeSystem *m_typeSystem;
 };
 
 

src/plugins/qmleditor/qmleditor.cpp

@@ -400,7 +400,7 @@ ScriptEditor::ScriptEditor(QWidget *parent) :
     baseTextDocument()->setSyntaxHighlighter(new QmlHighlighter);
 
     m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<QmlModelManagerInterface>();
-    m_typeSystem = ExtensionSystem::PluginManager::instance()->getObject<Qml::MetaType::QmlTypeSystem>();
+    m_typeSystem = ExtensionSystem::PluginManager::instance()->getObject<Qml::QmlTypeSystem>();
 
     if (m_modelManager) {
         connect(m_modelManager, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),

src/plugins/qmleditor/qmleditor.h

@@ -44,9 +44,7 @@ class ICore;
 }
 
 namespace Qml {
-    namespace MetaType {
+    class QmlTypeSystem;
-        class QmlTypeSystem;
-    }
 }
 
 namespace QmlEditor {
@@ -152,7 +150,7 @@ private:
     QList<QmlJS::DiagnosticMessage> m_diagnosticMessages;
     QmlDocument::Ptr m_document;
     QmlModelManagerInterface *m_modelManager;
-    Qml::MetaType::QmlTypeSystem *m_typeSystem;
+    Qml::QmlTypeSystem *m_typeSystem;
 };
 
 } // namespace Internal

src/plugins/qmleditor/qmleditorplugin.cpp

@@ -86,15 +86,13 @@ QmlEditorPlugin::~QmlEditorPlugin()
 
 bool QmlEditorPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
 {
-    typedef SharedTools::QScriptHighlighter QScriptHighlighter;
-
     Core::ICore *core = Core::ICore::instance();
     if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmleditor/QmlEditor.mimetypes.xml"), error_message))
         return false;
 
     m_modelManager = new QmlModelManager(this);
     addAutoReleasedObject(m_modelManager);
-    Qml::MetaType::QmlTypeSystem *typeSystem = new Qml::MetaType::QmlTypeSystem;
+    Qml::QmlTypeSystem *typeSystem = new Qml::QmlTypeSystem;
     addAutoReleasedObject(typeSystem);
 
     QList<int> context;

src/plugins/qmleditor/qmlhoverhandler.cpp

@@ -187,7 +187,7 @@ void QmlHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
         QmlExpressionUnderCursor expressionUnderCursor;
         expressionUnderCursor(tc, doc);
 
-        Qml::MetaType::QmlTypeSystem *typeSystem = ExtensionSystem::PluginManager::instance()->getObject<Qml::MetaType::QmlTypeSystem>();
+        Qml::QmlTypeSystem *typeSystem = ExtensionSystem::PluginManager::instance()->getObject<Qml::QmlTypeSystem>();
 
         QmlLookupContext context(expressionUnderCursor.expressionScopes(), doc, m_modelManager->snapshot(), typeSystem);
         QmlResolveExpression resolver(context);

src/plugins/qmleditor/qmllookupcontext.cpp

@@ -9,7 +9,6 @@
 #include <QDebug>
 
 using namespace Qml;
-using namespace Qml::MetaType;
 using namespace QmlEditor;
 using namespace QmlEditor::Internal;
 using namespace QmlJS;

src/plugins/qmleditor/qmllookupcontext.h

@@ -17,7 +17,7 @@ public:
     QmlLookupContext(const QStack<Qml::QmlSymbol *> &scopes,
                      const QmlDocument::Ptr &doc,
                      const Snapshot &snapshot,
-                     Qml::MetaType::QmlTypeSystem *typeSystem);
+                     Qml::QmlTypeSystem *typeSystem);
 
     Qml::QmlSymbol *resolve(const QString &name);
     Qml::QmlSymbol *resolveType(const QString &name)
@@ -44,7 +44,7 @@ private:
     QStack<Qml::QmlSymbol *> _scopes;
     QmlDocument::Ptr _doc;
     Snapshot _snapshot;
-    Qml::MetaType::QmlTypeSystem *m_typeSystem;
+    Qml::QmlTypeSystem *m_typeSystem;
 };
 
 } // namespace Internal

src/shared/qml/metatype/QmlMetaTypeBackend.cpp

@@ -1,7 +1,7 @@
 #include "QmlMetaTypeBackend.h"
 #include "qmltypesystem.h"
 
-using namespace Qml::MetaType;
+using namespace Qml;
 
 QmlMetaTypeBackend::QmlMetaTypeBackend(QmlTypeSystem *typeSystem):
         m_typeSystem(typeSystem)

src/shared/qml/metatype/QmlMetaTypeBackend.h

@@ -6,7 +6,6 @@
 #include <qml/qmlsymbol.h>
 
 namespace Qml {
-namespace MetaType {
 
 class QmlTypeSystem;
 
@@ -27,7 +26,6 @@ private:
     QmlTypeSystem *m_typeSystem;
 };
 
-} // namespace MetaType
 } // namespace Qml
 
 #endif // QMLMETATYPEBACKEND_H

src/shared/qml/metatype/QtDeclarativeMetaTypeBackend.cpp

@@ -4,7 +4,6 @@
 #include <QDebug>
 
 namespace Qml {
-namespace MetaType {
 namespace Internal {
 
 class QmlDeclarativeSymbol: public QmlBuildInSymbol
@@ -31,7 +30,7 @@ class QmlDeclarativeObjectSymbol: public QmlDeclarativeSymbol
     QmlDeclarativeObjectSymbol &operator=(const QmlDeclarativeObjectSymbol &);
 
 public:
-    QmlDeclarativeObjectSymbol(const QKineticDesigner::NodeMetaInfo &metaInfo, QtDeclarativeMetaTypeBackend* backend):
+    QmlDeclarativeObjectSymbol(const NodeMetaInfo &metaInfo, QtDeclarativeMetaTypeBackend* backend):
             QmlDeclarativeSymbol(backend),
             m_metaInfo(metaInfo)
     {
@@ -71,7 +70,7 @@ public:
     }
 
 public:
-    static QString key(const QKineticDesigner::NodeMetaInfo &metaInfo)
+    static QString key(const NodeMetaInfo &metaInfo)
     {
         return key(metaInfo.typeName(), metaInfo.majorVersion(), metaInfo.minorVersion());
     }
@@ -107,7 +106,7 @@ private:
     }
 
 private:
-    QKineticDesigner::NodeMetaInfo m_metaInfo;
+    NodeMetaInfo m_metaInfo;
     QString m_name;
 
     bool m_membersToBeDone;
@@ -120,7 +119,7 @@ class QmlDeclarativePropertySymbol: public QmlDeclarativeSymbol
     QmlDeclarativePropertySymbol &operator=(const QmlDeclarativePropertySymbol &);
 
 public:
-    QmlDeclarativePropertySymbol(const QKineticDesigner::PropertyMetaInfo &metaInfo, QtDeclarativeMetaTypeBackend* backend):
+    QmlDeclarativePropertySymbol(const PropertyMetaInfo &metaInfo, QtDeclarativeMetaTypeBackend* backend):
             QmlDeclarativeSymbol(backend),
             m_metaInfo(metaInfo)
     {
@@ -146,21 +145,19 @@ public:
     }
 
 private:
-    QKineticDesigner::PropertyMetaInfo m_metaInfo;
+    PropertyMetaInfo m_metaInfo;
 };
     
 } // namespace Internal
-} // namespace MetaType
 } // namespace Qml
 
 using namespace Qml;
-using namespace Qml::MetaType;
+using namespace Qml::Internal;
-using namespace Qml::MetaType::Internal;
 
 QtDeclarativeMetaTypeBackend::QtDeclarativeMetaTypeBackend(QmlTypeSystem *typeSystem):
         QmlMetaTypeBackend(typeSystem)
 {
-    foreach (const QKineticDesigner::NodeMetaInfo &metaInfo, QKineticDesigner::MetaInfo::global().allTypes()) {
+    foreach (const NodeMetaInfo &metaInfo, MetaInfo::global().allTypes()) {
         m_symbols.insert(QmlDeclarativeObjectSymbol::key(metaInfo), new QmlDeclarativeObjectSymbol(metaInfo, this));
     }
 }
@@ -175,7 +172,7 @@ QList<QmlSymbol *> QtDeclarativeMetaTypeBackend::availableTypes(const QString &p
     QList<QmlSymbol *> result;
     const QString prefix = package + QLatin1Char('/');
 
-    foreach (const QKineticDesigner::NodeMetaInfo &metaInfo, QKineticDesigner::MetaInfo::global().allTypes()) {
+    foreach (const NodeMetaInfo &metaInfo, MetaInfo::global().allTypes()) {
         if (metaInfo.typeName().startsWith(prefix) && metaInfo.majorVersion() == majorVersion && metaInfo.minorVersion() == minorVersion)
             result.append(getSymbol(metaInfo));
     }
@@ -195,36 +192,36 @@ QmlSymbol *QtDeclarativeMetaTypeBackend::resolve(const QString &typeName, const
     return 0;
 }
 
-QList<QmlSymbol *> QtDeclarativeMetaTypeBackend::members(const QKineticDesigner::NodeMetaInfo &metaInfo)
+QList<QmlSymbol *> QtDeclarativeMetaTypeBackend::members(const NodeMetaInfo &metaInfo)
 {
     QList<QmlSymbol *> result;
 
-    foreach (const QKineticDesigner::PropertyMetaInfo &propertyInfo, metaInfo.properties(false).values()) {
+    foreach (const PropertyMetaInfo &propertyInfo, metaInfo.properties(false).values()) {
         result.append(new QmlDeclarativePropertySymbol(propertyInfo, this));
     }
 
     return result;
 }
 
-QList<QmlSymbol *> QtDeclarativeMetaTypeBackend::inheritedMembers(const QKineticDesigner::NodeMetaInfo &metaInfo)
+QList<QmlSymbol *> QtDeclarativeMetaTypeBackend::inheritedMembers(const NodeMetaInfo &metaInfo)
 {
     QList<QmlSymbol *> result;
 
-    foreach (const QKineticDesigner::NodeMetaInfo &superNode, metaInfo.directSuperClasses()) {
+    foreach (const NodeMetaInfo &superNode, metaInfo.directSuperClasses()) {
         result.append(getSymbol(superNode)->members(true));
     }
 
     return result;
 }
 
-QmlDeclarativeSymbol *QtDeclarativeMetaTypeBackend::typeOf(const QKineticDesigner::PropertyMetaInfo &metaInfo)
+QmlDeclarativeSymbol *QtDeclarativeMetaTypeBackend::typeOf(const PropertyMetaInfo &metaInfo)
 {
     const QString key = QmlDeclarativeObjectSymbol::key(metaInfo.type(), metaInfo.typeMajorVersion(), metaInfo.typeMinorVersion());
 
     return m_symbols.value(key, 0);
 }
 
-QmlDeclarativeSymbol *QtDeclarativeMetaTypeBackend::getSymbol(const QKineticDesigner::NodeMetaInfo &metaInfo)
+QmlDeclarativeSymbol *QtDeclarativeMetaTypeBackend::getSymbol(const NodeMetaInfo &metaInfo)
 {
     const QString key = QmlDeclarativeObjectSymbol::key(metaInfo);
 

src/shared/qml/metatype/QtDeclarativeMetaTypeBackend.h

@@ -8,7 +8,6 @@
 #include <QtCore/QList>
 
 namespace Qml {
-namespace MetaType {
 namespace Internal {
 
 class QmlDeclarativeSymbol;
@@ -29,19 +28,18 @@ public:
     virtual QmlSymbol *resolve(const QString &typeName, const QList<PackageInfo> &packages);
 
 protected:
-    QList<QmlSymbol *> members(const QKineticDesigner::NodeMetaInfo &metaInfo);
+    QList<QmlSymbol *> members(const Qml::NodeMetaInfo &metaInfo);
-    QList<QmlSymbol *> inheritedMembers(const QKineticDesigner::NodeMetaInfo &metaInfo);
+    QList<QmlSymbol *> inheritedMembers(const Qml::NodeMetaInfo &metaInfo);
-    QmlDeclarativeSymbol *typeOf(const QKineticDesigner::PropertyMetaInfo &metaInfo);
+    QmlDeclarativeSymbol *typeOf(const Qml::PropertyMetaInfo &metaInfo);
 
 private:
-    QmlDeclarativeSymbol *getSymbol(const QKineticDesigner::NodeMetaInfo &metaInfo);
+    QmlDeclarativeSymbol *getSymbol(const Qml::NodeMetaInfo &metaInfo);
 
 private:
     QMap<QString, QmlDeclarativeSymbol*> m_symbols;
 };
 
 } // namespace Internal
-} // namespace MetaType
 } // namespace Qml
 
 #endif // QTDECLARATIVEMETATYPEBACKEND_H

src/shared/qml/metatype/exception.cpp

@@ -5,6 +5,7 @@
 #include <cxxabi.h>
 #endif
 
+#include <QDebug>
 #include <QRegExp>
 
 /*!
@@ -18,8 +19,7 @@
     the result would be a inconsistent model or a crash.
 */
 
-
+using namespace Qml;
-namespace QKineticDesigner {
 
 #ifdef Q_OS_LINUX
 const char* demangle(const char* name)
@@ -160,4 +160,3 @@ QDebug operator<<(QDebug debug, const Exception &exception)
 
 \returns the type as a string
 */
-}

src/shared/qml/metatype/exception.h

@@ -4,9 +4,8 @@
 #include <qml/qml_global.h>
 
 #include <QString>
-#include <QtDebug>
 
-namespace QKineticDesigner {
+namespace Qml {
 
 class QML_EXPORT Exception
 {
@@ -37,6 +36,6 @@ private:
 
 QML_EXPORT QDebug operator<<(QDebug debug, const Exception &exception);
 
-}
+} // namespace Qml
 
 #endif // EXCEPTION_H

src/shared/qml/metatype/invalidmetainfoexception.cpp

@@ -7,7 +7,7 @@
 
 \see NodeMetaInfo PropertyMetaInfo MetaInfo
 */
-namespace QKineticDesigner {
+using namespace Qml;
 /*!
 \brief Constructor
 
@@ -31,5 +31,3 @@ QString InvalidMetaInfoException::type() const
 {
     return "InvalidMetaInfoException";
 }
-
-}

src/shared/qml/metatype/invalidmetainfoexception.h

@@ -3,7 +3,7 @@
 
 #include "exception.h"
 
-namespace QKineticDesigner {
+namespace Qml {
 
 class QML_EXPORT InvalidMetaInfoException : public Exception
 {

src/shared/qml/metatype/metainfo.cpp

@@ -2,6 +2,7 @@
 #include "metainfo.h"
 #include "propertymetainfo.h"
 
+#include <QDebug>
 #include <QPair>
 #include <QtAlgorithms>
 #include <QMetaProperty>
@@ -11,7 +12,7 @@ enum {
     debug = false
 };
 
-namespace QKineticDesigner {
+namespace Qml {
 namespace Internal {
 
 class MetaInfoPrivate
@@ -68,8 +69,6 @@ void MetaInfoPrivate::initialize()
     m_isInitialized = true;
 }
 
-
-
 void MetaInfoPrivate::parseProperties(NodeMetaInfo &nodeMetaInfo, const QMetaObject *qMetaObject) const
 {
     Q_ASSERT_X(qMetaObject, Q_FUNC_INFO, "invalid QMetaObject");
@@ -219,7 +218,7 @@ void MetaInfoPrivate::parseNonQmlTypes()
 
 } // namespace Internal
 
-using QKineticDesigner::Internal::MetaInfoPrivate;
+using Qml::Internal::MetaInfoPrivate;
 
 MetaInfo MetaInfo::s_global;
 QStringList MetaInfo::s_pluginDirs;

src/shared/qml/metatype/metainfo.h

@@ -10,7 +10,7 @@
 #include <QStringList>
 #include <QtCore/QSharedPointer>
 
-namespace QKineticDesigner {
+namespace Qml {
 
 class ModelNode;
 class AbstractProperty;
@@ -27,10 +27,10 @@ QML_EXPORT bool operator!=(const MetaInfo &first, const MetaInfo &second);
 
 class QML_EXPORT MetaInfo
 {
-    friend class QKineticDesigner::Internal::MetaInfoPrivate;
+    friend class Qml::Internal::MetaInfoPrivate;
-    friend class QKineticDesigner::Internal::MetaInfoParser;
+    friend class Qml::Internal::MetaInfoParser;
-    friend class QKineticDesigner::NodeMetaInfo;
+    friend class Qml::NodeMetaInfo;
-    friend bool QKineticDesigner::operator==(const MetaInfo &, const MetaInfo &);
+    friend bool Qml::operator==(const MetaInfo &, const MetaInfo &);
 
 public:
     MetaInfo(const MetaInfo &metaInfo);
@@ -78,6 +78,6 @@ private:
     static QStringList s_pluginDirs;
 };
 
-} //namespace QKineticDesigner
+} // namespace Qml
 
 #endif // METAINFO_H

src/shared/qml/metatype/nodemetainfo.cpp

@@ -12,8 +12,7 @@
 #include <QtDeclarative/QmlComponent>
 #include <private/qmlvaluetype_p.h>
 
-namespace QKineticDesigner {
+namespace Qml {
-
 namespace Internal {
 
 class NodeMetaInfoData : public QSharedData
@@ -668,28 +667,4 @@ void NodeMetaInfo::setQmlFile(const QString &filePath)
     m_data->qmlFile = filePath;
 }
 
-//QDataStream& operator<<(QDataStream& stream, const NodeMetaInfo& nodeMetaInfo)
+} // namespace Qml
-//{
-//    stream << nodeMetaInfo.typeName();
-//    stream << nodeMetaInfo.majorVersion();
-//    stream << nodeMetaInfo.minorVersionTo();
-//
-//    return stream;
-//}
-//
-//QDataStream& operator>>(QDataStream& stream, NodeMetaInfo& nodeMetaInfo)
-//{
-//    QString typeName;
-//    int minorVersion;
-//    int majorVersion;
-//
-//    stream >> minorVersion;
-//    stream >> majorVersion;
-//    stream >> typeName;
-//
-//    nodeMetaInfo = MetaInfo::global().nodeMetaInfo(typeName/*, majorVersion ,minorVersion*/);
-//
-//    return stream;
-//}
-
-} // namespace QKineticDesigner

src/shared/qml/metatype/nodemetainfo.h

@@ -10,7 +10,7 @@
 
 class QmlContext;
 
-namespace QKineticDesigner {
+namespace Qml {
 
 class MetaInfo;
 
@@ -26,10 +26,10 @@ class PropertyMetaInfo;
 
 class QML_EXPORT NodeMetaInfo
 {
-    friend class QKineticDesigner::MetaInfo;
+    friend class Qml::MetaInfo;
-    friend class QKineticDesigner::Internal::ItemLibraryInfoData;
+    friend class Qml::Internal::ItemLibraryInfoData;
-    friend class QKineticDesigner::Internal::MetaInfoPrivate;
+    friend class Qml::Internal::MetaInfoPrivate;
-    friend class QKineticDesigner::Internal::MetaInfoParser;
+    friend class Qml::Internal::MetaInfoParser;
     friend QML_EXPORT uint qHash(const NodeMetaInfo &nodeMetaInfo);
     friend QML_EXPORT bool operator ==(const NodeMetaInfo &firstNodeInfo, const NodeMetaInfo &secondNodeInfo);
 
@@ -98,6 +98,6 @@ private:
 QML_EXPORT uint qHash(const NodeMetaInfo &nodeMetaInfo);
 QML_EXPORT bool operator ==(const NodeMetaInfo &firstNodeInfo,
                             const NodeMetaInfo &secondNodeInfo);
-}
+} // namespace Qml
 
 #endif // NODEMETAINFO_H

src/shared/qml/metatype/propertymetainfo.cpp

@@ -6,10 +6,8 @@
 #include "metainfo.h"
 #include <private/qmlvaluetype_p.h>
 
-namespace QKineticDesigner {
+namespace Qml {
-
+namespace Internal {
-namespace Internal
-{
 
 class PropertyMetaInfoData : public QSharedData
 {
@@ -42,7 +40,7 @@ public:
     QHash<QString, QVariant> defaultValueHash;
 };
 
-}
+} // namespace Internal
 
 /*!
 \class QKineticDesigner::PropertyMetaInfo
@@ -375,4 +373,4 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &originalVariant) const
     }
 }
 
-}
+} // namespace Qml

src/shared/qml/metatype/propertymetainfo.h

@@ -7,7 +7,7 @@
 #include <QExplicitlySharedDataPointer>
 #include <QVariant>
 
-namespace QKineticDesigner {
+namespace Qml {
 
 class MetaInfo;
 class NodeMetaInfo;
@@ -22,10 +22,10 @@ class PropertyMetaInfoData;
 
 class QML_EXPORT PropertyMetaInfo
 {
-    friend class QKineticDesigner::Internal::MetaInfoPrivate;
+    friend class Qml::Internal::MetaInfoPrivate;
-    friend class QKineticDesigner::Internal::MetaInfoParser;
+    friend class Qml::Internal::MetaInfoParser;
-    friend class QKineticDesigner::MetaInfo;
+    friend class Qml::MetaInfo;
-    friend class QKineticDesigner::NodeMetaInfo;
+    friend class Qml::NodeMetaInfo;
 public:
     PropertyMetaInfo();
     ~PropertyMetaInfo();
@@ -78,7 +78,7 @@ private:
     QExplicitlySharedDataPointer<Internal::PropertyMetaInfoData> m_data;
 };
 
-}
+} // namespace Qml
 
 
 #endif // PROPERTYMETAINFO_H

src/shared/qml/metatype/qmltypesystem.cpp

@@ -8,7 +8,6 @@
 #include <QDebug>
 
 using namespace Qml;
-using namespace Qml::MetaType;
 
 QmlTypeSystem::QmlTypeSystem()
 {

src/shared/qml/metatype/qmltypesystem.h

@@ -9,7 +9,6 @@
 #include <QtCore/QObject>
 
 namespace Qml {
-namespace MetaType {
 
 class QmlMetaTypeBackend;
 
@@ -28,7 +27,6 @@ private:
     QList<QmlMetaTypeBackend *> backends;
 };
 
-} // namespace MetaType
 } // namespace Qml
 
 #endif // QMLTYPESYSTEM_H

src/shared/qml/qml.pri

@@ -9,6 +9,7 @@ HEADERS += \
     $$PWD/qmldocument.h \
     $$PWD/qmlpackageinfo.h \
     $$PWD/qmlsymbol.h \
+    $$PWD/metatype/exception.h \
     $$PWD/metatype/QmlMetaTypeBackend.h \
     $$PWD/metatype/qmltypesystem.h
 
@@ -17,6 +18,7 @@ SOURCES += \
     $$PWD/qmldocument.cpp \
     $$PWD/qmlsymbol.cpp \
     $$PWD/qmlpackageinfo.cpp \
+    $$PWD/metatype/exception.cpp \
     $$PWD/metatype/QmlMetaTypeBackend.cpp \
     $$PWD/metatype/qmltypesystem.cpp
 
@@ -30,14 +32,12 @@ contains(QT_CONFIG, declarative) {
         $$PWD/metatype/nodemetainfo.h \
         $$PWD/metatype/propertymetainfo.h \
         $$PWD/metatype/QtDeclarativeMetaTypeBackend.h \
-        $$PWD/metatype/invalidmetainfoexception.h \
+        $$PWD/metatype/invalidmetainfoexception.h
-        $$PWD/metatype/exception.h
 
     SOURCES += \
         $$PWD/metatype/metainfo.cpp \
         $$PWD/metatype/nodemetainfo.cpp \
         $$PWD/metatype/propertymetainfo.cpp \
         $$PWD/metatype/QtDeclarativeMetaTypeBackend.cpp \
-        $$PWD/metatype/invalidmetainfoexception.cpp \
+        $$PWD/metatype/invalidmetainfoexception.cpp
-        $$PWD/metatype/exception.cpp
 }