Fix build of imports

 * Fix export macro used in webkit
 * Fix dependencies on declarative/mutlimedia
 * Copy qmldir files into the build tree

24 files changed, 153 insertions, 74 deletions

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index a7ec18e..4287e25 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,5 +1,29 @@
-TEMPLATE = subdirs
+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
 
-SUBDIRS	= libdeclarative.pro imports
+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/declarative/imports/qimportbase.pri b/src/declarative/imports/qimportbase.pri
deleted file mode 100644
index 5b0a4e2..0000000
--- a/src/declarative/imports/qimportbase.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-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/declarative/imports/webkit/webkit.pro b/src/declarative/imports/webkit/webkit.pro
deleted file mode 100644
index 7ad8564..0000000
--- a/src/declarative/imports/webkit/webkit.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TARGET  = webkitqmlplugin
-include(../qimportbase.pri)
-
-contains(QT_CONFIG, webkit) {
-    QT += webkit declarative
-
-    SOURCES += qdeclarativewebview.cpp plugin.cpp
-    HEADERS += qdeclarativewebview_p.h
-    HEADERS += qdeclarativewebview_p_p.h
-
-    QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/org/webkit
-    target.path = $$[QT_INSTALL_IMPORTS]/org/webkit
-
-    qmldir.files += $$QT_BUILD_TREE/imports/org/webkit/qmldir
-    qmldir.path +=  $$[QT_INSTALL_IMPORTS]/org/webkit
-
-    INSTALLS += target qmldir
-}
diff --git a/src/declarative/libdeclarative.pro b/src/declarative/libdeclarative.pro
deleted file mode 100644
index 4287e25..0000000
--- a/src/declarative/libdeclarative.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-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/declarative/imports/imports.pro b/src/imports/imports.pro
index f874644..8b47043 100644
--- a/src/declarative/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += widgets
 
-contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
+contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
 
diff --git a/src/declarative/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 8becbf3..8becbf3 100644
--- a/src/declarative/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
diff --git a/src/declarative/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index d601d2e..ad2ce1b 100644
--- a/src/declarative/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -1,4 +1,5 @@
 TARGET  = multimedia
+TARGETPATH = $$[QT_INSTALL_IMPORTS]/Qt/multimedia
 include(../qimportbase.pri)
 
 QT += multimedia declarative
@@ -6,10 +7,9 @@ QT += multimedia declarative
 SOURCES += multimedia.cpp
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia
-target.path = $$[QT_INSTALL_IMPORTS]/Qt/multimedia
+target.path = $$TARGETPATH
 
 qmldir.files += $$QT_BUILD_TREE/imports/Qt/multimedia/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/Qt/multimedia
+qmldir.path +=  $$TARGETPATH
 
 INSTALLS += target qmldir
-
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
new file mode 100644
index 0000000..0e6f656
--- /dev/null
+++ b/src/imports/multimedia/qmldir
@@ -0,0 +1 @@
+plugin multimedia
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
new file mode 100644
index 0000000..363dd88
--- /dev/null
+++ b/src/imports/qimportbase.pri
@@ -0,0 +1,33 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+
+isEmpty(TARGETPATH) {
+    error("qimportbase.pri: You must provide a TARGETPATH!")
+}
+isEmpty(TARGET) {
+    error("qimportbase.pri: You must provide a TARGET!")
+}
+
+QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
+copy2build.input = QMLDIRFILE
+copy2build.output = $$TARGETPATH/qmldir
+isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
+copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+copy2build.name = COPY ${QMAKE_FILE_IN}
+copy2build.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += copy2build
+
+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/declarative/imports/webkit/plugin.cpp b/src/imports/webkit/plugin.cpp
index 2f6205d..2f6205d 100644
--- a/src/declarative/imports/webkit/plugin.cpp
+++ b/src/imports/webkit/plugin.cpp
diff --git a/src/declarative/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 733ac86..733ac86 100644
--- a/src/declarative/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
diff --git a/src/declarative/imports/webkit/qdeclarativewebview_p.h b/src/imports/webkit/qdeclarativewebview_p.h
index 0bb5d29..5efc3b5 100644
--- a/src/declarative/imports/webkit/qdeclarativewebview_p.h
+++ b/src/imports/webkit/qdeclarativewebview_p.h
@@ -42,6 +42,8 @@
 #ifndef QDECLARATIVEWEBVIEW_H
 #define QDECLARATIVEWEBVIEW_H
 
+#include "webkitqmlplugin_export.h"
+
 #include <private/qdeclarativepainteditem_p.h>
 
 #include <QtGui/QAction>
@@ -61,7 +63,7 @@ class QDeclarativeWebViewPrivate;
 class QNetworkRequest;
 class QDeclarativeWebView;
 
-class Q_DECLARATIVE_EXPORT QDeclarativeWebPage : public QWebPage
+class WEBKITQMLPLUGIN_EXPORT QDeclarativeWebPage : public QWebPage
 {
     Q_OBJECT
 public:
@@ -85,7 +87,7 @@ class QDeclarativeWebViewAttached;
 
 //### TODO: browser plugins
 
-class Q_DECLARATIVE_EXPORT QDeclarativeWebView : public QDeclarativePaintedItem
+class WEBKITQMLPLUGIN_EXPORT QDeclarativeWebView : public QDeclarativePaintedItem
 {
     Q_OBJECT
 
diff --git a/src/declarative/imports/webkit/qdeclarativewebview_p_p.h b/src/imports/webkit/qdeclarativewebview_p_p.h
index 258b472..258b472 100644
--- a/src/declarative/imports/webkit/qdeclarativewebview_p_p.h
+++ b/src/imports/webkit/qdeclarativewebview_p_p.h
diff --git a/src/imports/webkit/qmldir b/src/imports/webkit/qmldir
new file mode 100644
index 0000000..258aa2c
--- /dev/null
+++ b/src/imports/webkit/qmldir
@@ -0,0 +1 @@
+plugin webkitqmlplugin
diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro
new file mode 100644
index 0000000..76b46f1
--- /dev/null
+++ b/src/imports/webkit/webkit.pro
@@ -0,0 +1,19 @@
+TARGET  = webkitqmlplugin
+TARGETPATH = $$[QT_INSTALL_IMPORTS]/org/webkit
+include(../qimportbase.pri)
+
+QT += webkit declarative
+DEFINES += WEBKITQMLPLUGIN_EXPORTS
+
+SOURCES += qdeclarativewebview.cpp plugin.cpp
+HEADERS += qdeclarativewebview_p.h \
+    qdeclarativewebview_p_p.h \
+	webkitqmlplugin_export.h
+
+QTDIR_build:DESTDIR = $$TARGETPATH
+target.path = $$TARGETPATH
+
+qmldir.files += $$QT_BUILD_TREE/imports/org/webkit/qmldir
+qmldir.path +=  $$TARGETPATH
+
+INSTALLS += target qmldir
diff --git a/src/imports/webkit/webkitqmlplugin_export.h b/src/imports/webkit/webkitqmlplugin_export.h
new file mode 100644
index 0000000..974fd24
--- /dev/null
+++ b/src/imports/webkit/webkitqmlplugin_export.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEBKITQMLPLUGIN_EXPORT_H
+#define WEBKITQMLPLUGIN_EXPORT_H
+
+#include <QtCore/QtGlobal>
+
+#if defined WEBKITQMLPLUGIN_EXPORTS
+#    define WEBKITQMLPLUGIN_EXPORT Q_DECL_EXPORT
+#else
+#    define WEBKITQMLPLUGIN_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // WEBKITQMLPLUGIN_EXPORT_H
diff --git a/src/declarative/imports/widgets/graphicslayouts.cpp b/src/imports/widgets/graphicslayouts.cpp
index fc15ad2..fc15ad2 100644
--- a/src/declarative/imports/widgets/graphicslayouts.cpp
+++ b/src/imports/widgets/graphicslayouts.cpp
diff --git a/src/declarative/imports/widgets/graphicslayouts_p.h b/src/imports/widgets/graphicslayouts_p.h
index f9b9ae8..f9b9ae8 100644
--- a/src/declarative/imports/widgets/graphicslayouts_p.h
+++ b/src/imports/widgets/graphicslayouts_p.h
diff --git a/src/declarative/imports/widgets/graphicswidgets.cpp b/src/imports/widgets/graphicswidgets.cpp
index 062e516..062e516 100644
--- a/src/declarative/imports/widgets/graphicswidgets.cpp
+++ b/src/imports/widgets/graphicswidgets.cpp
diff --git a/src/declarative/imports/widgets/graphicswidgets_p.h b/src/imports/widgets/graphicswidgets_p.h
index 2c2b707..2c2b707 100644
--- a/src/declarative/imports/widgets/graphicswidgets_p.h
+++ b/src/imports/widgets/graphicswidgets_p.h
diff --git a/src/imports/widgets/qmldir b/src/imports/widgets/qmldir
new file mode 100644
index 0000000..6f19878
--- /dev/null
+++ b/src/imports/widgets/qmldir
@@ -0,0 +1 @@
+plugin widgets
diff --git a/src/declarative/imports/widgets/widgets.cpp b/src/imports/widgets/widgets.cpp
index ec21cc4..ec21cc4 100644
--- a/src/declarative/imports/widgets/widgets.cpp
+++ b/src/imports/widgets/widgets.cpp
diff --git a/src/declarative/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index 230d398..b98be59 100644
--- a/src/declarative/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -1,4 +1,5 @@
 TARGET  = widgets
+TARGETPATH = $$[QT_INSTALL_IMPORTS]/Qt/widgets
 include(../qimportbase.pri)
 
 QT += declarative
@@ -12,9 +13,10 @@ HEADERS += \
     graphicslayouts_p.h
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/widgets
-target.path = $$[QT_INSTALL_IMPORTS]/Qt/widgets
+target.path = $$TARGETPATH
 
-qmldir.files += $$QT_BUILD_TREE/imports/Qt/widgets/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/Qt/widgets
+# install qmldir file
+qmldir.files += qmldir
+qmldir.path = $$TARGETPATH
 
 INSTALLS += target qmldir
diff --git a/src/src.pro b/src/src.pro
index 2b9dc30..7bb731e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -29,6 +29,7 @@ contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
 contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
 contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia
 SRC_SUBDIRS += src_plugins
+contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports
 
 src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
 src_s60main.target = sub-s60main
@@ -70,6 +71,8 @@ src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt
 src_activeqt.target = sub-activeqt
 src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins
 src_plugins.target = sub-plugins
+src_imports.subdir = $$QT_SOURCE_TREE/src/imports
+src_imports.target = sub-imports
 src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib
 src_testlib.target = sub-testlib
 src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore
@@ -103,11 +106,13 @@ src_declarative.target = sub-declarative
    src_tools_activeqt.depends = src_tools_idc src_gui
    src_declarative.depends = src_xml src_gui src_script src_network src_svg
    src_plugins.depends = src_gui src_sql src_svg src_multimedia
+   src_imports.depends = src_gui src_declarative
    contains(QT_CONFIG, webkit)  {
       src_webkit.depends = src_gui src_sql src_network src_xml 
       contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon
       contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
       contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
+	  src_imports.depends += webkit
       #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
    }
    contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
@@ -117,6 +122,7 @@ src_declarative.target = sub-declarative
    }
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
    contains(QT_CONFIG, declarative): src_multimedia.depends += src_declarative
+   contains(QT_CONFIG, multimedia): src_imports += src_multimedia
 }
 
 !symbian {