diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
commit | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (patch) | |
tree | 9ed5acfa397b093fd726742ae3c478c2f21223bc /src/src.pro | |
parent | 1b4bb02fcb3da77ddfa6281365ba3210aab9daad (diff) | |
parent | f3da2f414f9fce9aa014da79be9f50c075c60936 (diff) | |
download | Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.zip Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.gz Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.bz2 |
Merge remote branch 'qt/4.6' into qt-master-from-4.6
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index 8dec49b..f2070ae 100644 --- a/src/src.pro +++ b/src/src.pro @@ -106,6 +106,7 @@ src_declarative.target = sub-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 #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore } |