diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 13:31:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 13:31:04 (GMT) |
| commit | c69b74008c72b7e2da5ff4bc57112b89d0a36d7d (patch) | |
| tree | 78150eddaf9fed19b6b5b6a8310a7ced3d8da13d /src/src.pro | |
| parent | 2a82051815a3c8bb8fbb2b58dff5653c80d6fa33 (diff) | |
| parent | 8a1e5081753078a4af886c4661794a59dafc898a (diff) | |
| download | Qt-c69b74008c72b7e2da5ff4bc57112b89d0a36d7d.zip Qt-c69b74008c72b7e2da5ff4bc57112b89d0a36d7d.tar.gz Qt-c69b74008c72b7e2da5ff4bc57112b89d0a36d7d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
doc: Fixed the last qdoc errors.
doc: Document the "Type" enum value as a const in variable.
Designer: Add lower/raise to context menu.
Compile with no-webkit - add missing semi-colons.
Fixes visibility update missing when doing setParentItem on graphicsitem
Stabilize tst_QGraphicsScene::polishItems2 (new test)
Fixed an infinite loop that could occur when reading invalid BMP images.
Updated docs regarding QGLWidget::renderText() limitations.
Added optimization flag to QGraphicsItemPrivate.
Fixed child items with graphics effects not inheriting opacity.
Made the trace replayer handle limited resolution cases better.
Small optimization in raster paint engine.
Another ASSERT while deleting spans
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
...
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 } |