summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-07 01:31:48 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-07 01:31:48 (GMT)
commitba6778b080086ef1bb44059b4e871ad46405ce0e (patch)
tree241621ba632013c3a50cb3886b0c2f749b5ecd8f
parent354361bf6cd3ee9ae1600dc908d4483173fa691b (diff)
downloadQt-ba6778b080086ef1bb44059b4e871ad46405ce0e.zip
Qt-ba6778b080086ef1bb44059b4e871ad46405ce0e.tar.gz
Qt-ba6778b080086ef1bb44059b4e871ad46405ce0e.tar.bz2
Move qmetaobjectbuilder into declarative/qml directory
-rw-r--r--src/corelib/kernel/kernel.pri2
-rw-r--r--src/declarative/qml/qmetaobjectbuilder.cpp (renamed from src/corelib/kernel/qmetaobjectbuilder.cpp)0
-rw-r--r--src/declarative/qml/qmetaobjectbuilder_p.h (renamed from src/corelib/kernel/qmetaobjectbuilder_p.h)0
-rw-r--r--src/declarative/qml/qml.pri6
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index ddb4017..003693b 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -33,7 +33,6 @@ HEADERS += \
kernel/qsystemsemaphore.h \
kernel/qsystemsemaphore_p.h \
kernel/qfunctions_p.h \
- kernel/qmetaobjectbuilder_p.h \
kernel/qguard_p.h
SOURCES += \
@@ -56,7 +55,6 @@ SOURCES += \
kernel/qcoreglobaldata.cpp \
kernel/qsharedmemory.cpp \
kernel/qsystemsemaphore.cpp \
- kernel/qmetaobjectbuilder.cpp \
kernel/qpointer.cpp
win32 {
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index 58ee454..58ee454 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h
index d503163..d503163 100644
--- a/src/corelib/kernel/qmetaobjectbuilder_p.h
+++ b/src/declarative/qml/qmetaobjectbuilder_p.h
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 9a8d3f2..29d97ba 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -31,7 +31,8 @@ SOURCES += qml/qmlparser.cpp \
qml/qmlbasicscript.cpp \
qml/qmlvaluetype.cpp \
qml/qmlbindingoptimizations.cpp \
- qml/qmlxmlhttprequest.cpp
+ qml/qmlxmlhttprequest.cpp \
+ qml/qmetaobjectbuilder.cpp
HEADERS += qml/qmlparser_p.h \
qml/qmlinstruction_p.h \
@@ -79,7 +80,8 @@ HEADERS += qml/qmlparser_p.h \
qml/qpodvector_p.h \
qml/qmlvaluetype_p.h \
qml/qmlbindingoptimizations_p.h \
- qml/qmlxmlhttprequest_p.h
+ qml/qmlxmlhttprequest_p.h \
+ qml/qmetaobjectbuilder_p.h
# for qtscript debugger
contains(QT_CONFIG, scripttools):QT += scripttools