diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
| commit | 03686225036ebfc5cf78e3fcc66f5810a140c7d2 (patch) | |
| tree | e35bcaf151edb27b5e48fc989c6727039c397f5b /mkspecs | |
| parent | 194013d9db1b3e4ba6f56a864f3b64f523202948 (diff) | |
| parent | 72599ca45c416f2f0a9654412c14a148ca3d728c (diff) | |
| download | Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.zip Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.gz Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Optimize QML "parent" property access
Begin dragging PathView up to the level (quality and functionality) of other views.
Rename qdeclarativetime -> qmltime
Auto-test fix.
Build Fix and port to new width and height properties
Port Flickable and Flipable to support QGraphicsObject.
Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef
Fix the build due to new properties in QGraphicsObject.
Remove the children property from QDeclarativeItem.
Rename qdeclarativetime -> qmltime
Update AnchorChanges to use more natural form for setting anchors.
Pen is not a creatable type.
Begin dragging PathView up to the level (quality and functionality) of other views.
Fix error reporting when symbian file copy fails.
Stabilize QGraphicsEffect test on X11
QIODevice::read() and QFile::atEnd() performance improvements
Clarified pkg_prerules usage documentation.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Made it possible to define more than one language using pkg_prerules
Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 090f3b6..0b6de5e 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -113,3 +113,4 @@ QT_ARCH = symbian load(qt_config) load(symbian/platform_paths) + diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 0d2e6eb..bcb2867 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -22,19 +22,23 @@ load(qt) INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH # Add dependency to Qt package to all other projects besides Qt libs. -# Note: Qt libs with full capabilities has UID3 of 0x2001E61C, +# Note: Qt libs package with full capabilities has UID3 of 0x2001E61C, # while self-signed version typically has temporary UID3 of 0xE001E61C. contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) { - default_deployment.pkg_prerules += \ + pkg_depends_qt += \ "; Default dependency to Qt libraries" \ "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" # Projects linking to webkit need dependency to webkit contains(QT, webkit): { - default_deployment.pkg_prerules += \ + pkg_depends_webkit += \ "; Dependency to Qt Webkit" \ "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + } else { + default_deployment.pkg_prerules -= pkg_depends_webkit } +} else { + default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt } isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000 |