diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-06-18 12:22:13 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-06-18 12:23:45 (GMT) |
| commit | 8f1def139d6eaf99c22b43536d056964e0d41245 (patch) | |
| tree | 8bfa47eb4a9632bebe45f8896c511c6833ea84f9 /src/src.pro | |
| parent | 0ce072e74aea546852b6bb4b7f0c0fe0e2678aa5 (diff) | |
| download | Qt-8f1def139d6eaf99c22b43536d056964e0d41245.zip Qt-8f1def139d6eaf99c22b43536d056964e0d41245.tar.gz Qt-8f1def139d6eaf99c22b43536d056964e0d41245.tar.bz2 | |
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Also change a bit the demo due to a little API change. The module is not
org.webkit but QtWebKit now.
Reviewed-by:simon hausmann
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index 3ac69be..0d7404d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -27,6 +27,7 @@ contains(QT_CONFIG, script): SRC_SUBDIRS += src_script contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative SRC_SUBDIRS += src_plugins contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports +contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative # s60installs need to be at the end, because projects.pro does an ordered build, # and s60installs depends on all the others. @@ -82,6 +83,8 @@ src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative +src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative +src_webkit_declarative.target = sub-webkitdeclarative #CONFIG += ordered !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { @@ -133,6 +136,7 @@ src_declarative.target = sub-declarative contains(QT_CONFIG, svg) { src_declarative.depends += src_svg } + contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit } |