diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-03-02 16:56:17 (GMT) |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-03-02 19:43:44 (GMT) |
| commit | b0b19d286e10d307db4b9e477d4463eabc2b319d (patch) | |
| tree | 6307dab43ee4eb3ba3418e57814b9ec701087476 /src/src.pro | |
| parent | ba7677f77c35f7e6be9d8330d4e539d816cc33fd (diff) | |
| download | Qt-b0b19d286e10d307db4b9e477d4463eabc2b319d.zip Qt-b0b19d286e10d307db4b9e477d4463eabc2b319d.tar.gz Qt-b0b19d286e10d307db4b9e477d4463eabc2b319d.tar.bz2 | |
Fix build of imports
* Fix export macro used in webkit
* Fix dependencies on declarative/mutlimedia
* Copy qmldir files into the build tree
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 6 |
1 files changed, 6 insertions, 0 deletions
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 { |