diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-21 11:38:26 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-24 07:43:21 +0100 |
commit | 89e1cba2f671c1c46f81dcd36a168f469315c8ee (patch) | |
tree | a8713c6092c9f9192caaafa8ea2aa50118bcc6b0 /src | |
parent | 40a4713735c3266aeca31151f6e98f7db4f1885d (diff) |
Move QDeclarativeApplication from util/ to qml/
QDeclarativeEngine/QV8Engine depend on QDeclarativeApplication,
so this class should reside under qml/, not util/.
Change-Id: I2cd49ba1170bfb610a7607525891cb80c8828f27
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/qml/qdeclarativeapplication.cpp (renamed from src/declarative/util/qdeclarativeapplication.cpp) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeapplication_p.h (renamed from src/declarative/util/qdeclarativeapplication_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/qml.pri | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/util.pri | 2 |
6 files changed, 3 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/qml/qdeclarativeapplication.cpp index 765f8dd2cd..765f8dd2cd 100644 --- a/src/declarative/util/qdeclarativeapplication.cpp +++ b/src/declarative/qml/qdeclarativeapplication.cpp diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/qml/qdeclarativeapplication_p.h index aa51085f01..aa51085f01 100644 --- a/src/declarative/util/qdeclarativeapplication_p.h +++ b/src/declarative/qml/qdeclarativeapplication_p.h diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index ef638b4e44..05db2e8e21 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -175,6 +175,7 @@ void QDeclarativeEnginePrivate::defineModule() { registerBaseTypes("QtQuick", 2, 0); qmlRegisterType<QDeclarativeBinding>(); + qmlRegisterUncreatableType<QDeclarativeApplication>("QtQuick",2,0,"Application", QDeclarativeApplication::tr("Application is an abstract class")); qmlRegisterUncreatableType<QDeclarativeLocale>("QtQuick",2,0,"Locale",QDeclarativeEngine::tr("Locale cannot be instantiated. Use Qt.locale()")); } diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index a920d62a2a..444183eeab 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -1,4 +1,5 @@ SOURCES += \ + $$PWD/qdeclarativeapplication.cpp \ $$PWD/qdeclarativeinstruction.cpp \ $$PWD/qdeclarativevmemetaobject.cpp \ $$PWD/qdeclarativeengine.cpp \ @@ -50,6 +51,7 @@ HEADERS += \ $$PWD/qdeclarativeinstruction_p.h \ $$PWD/qdeclarativevmemetaobject_p.h \ $$PWD/qdeclarative.h \ + $$PWD/qdeclarativeapplication_p.h \ $$PWD/qdeclarativebinding_p.h \ $$PWD/qdeclarativebinding_p_p.h \ $$PWD/qdeclarativeproperty.h \ diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index 0a8f04b0de..4df3115eaf 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -59,7 +59,6 @@ #include "qdeclarativesystempalette_p.h" #include "qdeclarativetimer_p.h" #include "qdeclarativetransition_p.h" -#include "qdeclarativeapplication_p.h" #include <qdeclarativeinfo.h> #include <private/qdeclarativetypenotavailable_p.h> #ifndef QT_NO_XMLPATTERNS @@ -76,7 +75,6 @@ void QDeclarativeUtilModule::registerBaseTypes(const char *uri, int versionMajor void QDeclarativeUtilModule::defineModule() { - qmlRegisterUncreatableType<QDeclarativeApplication>("QtQuick",2,0,"Application", QDeclarativeApplication::tr("Application is an abstract class")); qmlRegisterUncreatableType<QInputPanel>("QtQuick",2,0,"InputPanel", QInputPanel::tr("InputPanel is an abstract class")); qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",2,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class")); diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 1d71225bf5..a93fff7f89 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -1,5 +1,4 @@ SOURCES += \ - $$PWD/qdeclarativeapplication.cpp \ $$PWD/qdeclarativeutilmodule.cpp\ $$PWD/qdeclarativeconnections.cpp \ $$PWD/qdeclarativepackage.cpp \ @@ -33,7 +32,6 @@ SOURCES += \ $$PWD/qdeclarativesvgparser.cpp HEADERS += \ - $$PWD/qdeclarativeapplication_p.h \ $$PWD/qdeclarativeutilmodule_p.h\ $$PWD/qdeclarativeconnections_p.h \ $$PWD/qdeclarativepackage_p.h \ |