diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-09 00:38:03 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-09 00:38:03 (GMT) |
| commit | c04a6e34b3d4da24d3cc26e192bebff2d3b79d19 (patch) | |
| tree | e2a5299daa1e53668e7f9adeac002f8fdd286f8a /src/src.pro | |
| parent | 51900441b77df5cb4755aaf2cba8351bbfe15e71 (diff) | |
| parent | db0c932bf816b76547798ec62336e25b453d29b8 (diff) | |
| download | Qt-c04a6e34b3d4da24d3cc26e192bebff2d3b79d19.zip Qt-c04a6e34b3d4da24d3cc26e192bebff2d3b79d19.tar.gz Qt-c04a6e34b3d4da24d3cc26e192bebff2d3b79d19.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 8c21ef7..403ffe1 100644 --- a/src/src.pro +++ b/src/src.pro @@ -112,7 +112,7 @@ src_declarative.target = sub-declarative 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 + src_imports.depends += src_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 |