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>

diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/qml/qdeclarativeapplication.cpp
similarity index 100%
rename from src/declarative/util/qdeclarativeapplication.cpp
rename to src/declarative/qml/qdeclarativeapplication.cpp

diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/qml/qdeclarativeapplication_p.h
similarity index 100%
rename from src/declarative/util/qdeclarativeapplication_p.h
rename to src/declarative/qml/qdeclarativeapplication_p.h

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index ef638b4..05db2e8 100644 (file)
--- 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 a920d62..444183e 100644 (file)
--- 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 0a8f04b..4df3115 100644 (file)
--- 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 1d71225..a93fff7 100644 (file)
--- 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 \