diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 15:59:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 15:59:50 (GMT) |
| commit | ea9f34568acd1286f5ed4e7f2bf760982a4e4579 (patch) | |
| tree | 232e346dba7226f35af80043e072538dba473201 /src/src.pro | |
| parent | f68f1de5b866a050c4b39f8eed984831b0e6956e (diff) | |
| parent | 1d8b7f41a5393f77eb3079513b083739edd90b91 (diff) | |
| download | Qt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.zip Qt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.tar.gz Qt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (329 commits)
Fixed drawImage() not to attempt drawing null images on openvg.
QS60Style: Update placeholder texture to real one
qdoc: Avoid infinite loops in table of contents generation.
Bump Qt version to 4.7.4
Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.
Remove incorrect check in qpixmap autotest.
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Don't crash calling QTextDocument::blockBoundingRect on invalid block
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
Fix writing to an attached property from script.
fixes/improvements for new QML right-to-left docs
Fix license headers in example code
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
...
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 060f48b..868e22f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -108,7 +108,7 @@ src_webkit_declarative.target = sub-webkitdeclarative src_phonon.depends = src_gui src_multimedia.depends = src_gui contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl - src_tools_activeqt.depends = src_tools_idc src_gui + src_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_gui src_script src_network src_plugins.depends = src_gui src_sql src_svg contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia |