18 files changed, 51 insertions, 31 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 4287e25..a7ec18e 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,29 +1,5 @@
-TARGET     = QtDeclarative
-QPRO_PWD   = $$PWD
-QT         = core gui xml script network
-contains(QT_CONFIG, svg): QT += svg
-contains(QT_CONFIG, opengl): QT += opengl
-DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
-win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
-solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+TEMPLATE = subdirs
 
-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml
+SUBDIRS	= libdeclarative.pro imports
 
-exists("qdeclarative_enable_gcov") {
-    QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
-    LIBS += -lgcov
-}
 
-include(../qbase.pri)
-
-#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
-#DESTDIR=.
-
-#modules
-include(3rdparty/3rdparty.pri)
-include(util/util.pri)
-include(graphicsitems/graphicsitems.pri)
-include(qml/qml.pri)
-include(debugger/debugger.pri)
-
-symbian:TARGET.UID3=0x2001E623
diff --git a/src/plugins/qdeclarativemodules/qdeclarativemodules.pro b/src/declarative/imports/imports.pro
index ae53578..f874644 100644
--- a/src/plugins/qdeclarativemodules/qdeclarativemodules.pro
+++ b/src/declarative/imports/imports.pro
@@ -3,5 +3,5 @@ TEMPLATE = subdirs
 SUBDIRS += widgets
 
 contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
-contains(QT_CONFIG, webkit): SUBDIRS += webkitqmlplugin
+contains(QT_CONFIG, webkit): SUBDIRS += webkit
 
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/declarative/imports/multimedia/multimedia.cpp
index 8becbf3..8becbf3 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp
+++ b/src/declarative/imports/multimedia/multimedia.cpp
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro b/src/declarative/imports/multimedia/multimedia.pro
index d8ad18e..d601d2e 100644
--- a/src/plugins/qdeclarativemodules/multimedia/multimedia.pro
+++ b/src/declarative/imports/multimedia/multimedia.pro
@@ -1,5 +1,5 @@
 TARGET  = multimedia
-include(../../qpluginbase.pri)
+include(../qimportbase.pri)
 
 QT += multimedia declarative
 
diff --git a/src/declarative/imports/qimportbase.pri b/src/declarative/imports/qimportbase.pri
new file mode 100644
index 0000000..5b0a4e2
--- /dev/null
+++ b/src/declarative/imports/qimportbase.pri
@@ -0,0 +1,16 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+TARGET = $$qtLibraryTarget($$TARGET)
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
+include(../../qt_targets.pri)
+
+wince*:LIBS += $$QMAKE_LIBS_GUI
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = All -Tcb
+    load(armcc_warnings)
+}
diff --git a/src/plugins/qdeclarativemodules/webkitqmlplugin/plugin.cpp b/src/declarative/imports/webkit/plugin.cpp
index 2f6205d..2f6205d 100644
--- a/src/plugins/qdeclarativemodules/webkitqmlplugin/plugin.cpp
+++ b/src/declarative/imports/webkit/plugin.cpp
diff --git a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview.cpp b/src/declarative/imports/webkit/qdeclarativewebview.cpp
index 733ac86..733ac86 100644
--- a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview.cpp
+++ b/src/declarative/imports/webkit/qdeclarativewebview.cpp
diff --git a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview_p.h b/src/declarative/imports/webkit/qdeclarativewebview_p.h
index 0bb5d29..0bb5d29 100644
--- a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview_p.h
+++ b/src/declarative/imports/webkit/qdeclarativewebview_p.h
diff --git a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview_p_p.h b/src/declarative/imports/webkit/qdeclarativewebview_p_p.h
index 258b472..258b472 100644
--- a/src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview_p_p.h
+++ b/src/declarative/imports/webkit/qdeclarativewebview_p_p.h
diff --git a/src/plugins/qdeclarativemodules/webkitqmlplugin/webkitqmlplugin.pro b/src/declarative/imports/webkit/webkit.pro
index 37fe37c..7ad8564 100644
--- a/src/plugins/qdeclarativemodules/webkitqmlplugin/webkitqmlplugin.pro
+++ b/src/declarative/imports/webkit/webkit.pro
@@ -1,5 +1,5 @@
 TARGET  = webkitqmlplugin
-include(../../qpluginbase.pri)
+include(../qimportbase.pri)
 
 contains(QT_CONFIG, webkit) {
     QT += webkit declarative
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp b/src/declarative/imports/widgets/graphicslayouts.cpp
index fc15ad2..fc15ad2 100644
--- a/src/plugins/qdeclarativemodules/widgets/graphicslayouts.cpp
+++ b/src/declarative/imports/widgets/graphicslayouts.cpp
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h b/src/declarative/imports/widgets/graphicslayouts_p.h
index f9b9ae8..f9b9ae8 100644
--- a/src/plugins/qdeclarativemodules/widgets/graphicslayouts_p.h
+++ b/src/declarative/imports/widgets/graphicslayouts_p.h
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp b/src/declarative/imports/widgets/graphicswidgets.cpp
index 062e516..062e516 100644
--- a/src/plugins/qdeclarativemodules/widgets/graphicswidgets.cpp
+++ b/src/declarative/imports/widgets/graphicswidgets.cpp
diff --git a/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h b/src/declarative/imports/widgets/graphicswidgets_p.h
index 2c2b707..2c2b707 100644
--- a/src/plugins/qdeclarativemodules/widgets/graphicswidgets_p.h
+++ b/src/declarative/imports/widgets/graphicswidgets_p.h
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/declarative/imports/widgets/widgets.cpp
index ec21cc4..ec21cc4 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp
+++ b/src/declarative/imports/widgets/widgets.cpp
diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.pro b/src/declarative/imports/widgets/widgets.pro
index 3ec38da..230d398 100644
--- a/src/plugins/qdeclarativemodules/widgets/widgets.pro
+++ b/src/declarative/imports/widgets/widgets.pro
@@ -1,5 +1,5 @@
 TARGET  = widgets
-include(../../qpluginbase.pri)
+include(../qimportbase.pri)
 
 QT += declarative
 
diff --git a/src/declarative/libdeclarative.pro b/src/declarative/libdeclarative.pro
new file mode 100644
index 0000000..4287e25
--- /dev/null
+++ b/src/declarative/libdeclarative.pro
@@ -0,0 +1,29 @@
+TARGET     = QtDeclarative
+QPRO_PWD   = $$PWD
+QT         = core gui xml script network
+contains(QT_CONFIG, svg): QT += svg
+contains(QT_CONFIG, opengl): QT += opengl
+DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
+win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
+solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+
+unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml
+
+exists("qdeclarative_enable_gcov") {
+    QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
+    LIBS += -lgcov
+}
+
+include(../qbase.pri)
+
+#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
+#DESTDIR=.
+
+#modules
+include(3rdparty/3rdparty.pri)
+include(util/util.pri)
+include(graphicsitems/graphicsitems.pri)
+include(qml/qml.pri)
+include(debugger/debugger.pri)
+
+symbian:TARGET.UID3=0x2001E623
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 418fd81..730fdc5 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -12,6 +12,5 @@ embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio mediaservices
-contains(QT_CONFIG, declarative): SUBDIRS *= qdeclarativemodules