diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 09:01:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 09:01:06 (GMT) |
| commit | 8c22d9ef7c19a742fcd024ff6e568526df8bfea8 (patch) | |
| tree | 967f13d0ba59615d841faaf7c49007edee8564ab /src/3rdparty | |
| parent | 3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (diff) | |
| parent | c2bee860f72898c6d57ff9f117256059b3952479 (diff) | |
| download | Qt-8c22d9ef7c19a742fcd024ff6e568526df8bfea8.zip Qt-8c22d9ef7c19a742fcd024ff6e568526df8bfea8.tar.gz Qt-8c22d9ef7c19a742fcd024ff6e568526df8bfea8.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (23 commits)
Refactor QDirectFBPixmap::fromImage slightly
QDirectFBPixmap can handle NoOpaqueDetection.
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
Fix compile error on Symbian 9.1, caused in network/access.
QInputContextFactory::languages implementation for Symbian.
QS60Style cannot draw transparency to UI element border areas
Changed pkg_prerules to not use default_deployment for vendor ID
Enable armcc version specific compler options for Symbian
Fix another off-by-1 error in OpenVG image painting.
Fix OpenVG build on non-Symbian platforms.
QNAM HTTP: Symbian compile fix
tst_qnetworkreply: Fix side effect, add another test
QNAM HTTP: Fix crazy crash when exiting application
Correct documentation for ObjectReplacementCharacter and ReplacementCh.
Prevents a useless repaint with QGraphicsItem cache mode.
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
Doc: Fix links in the ActiveQt framework, and also link to the tools.
...
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index e24e9e2..5fe9703 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -11,7 +11,7 @@ symbian: { } else { TARGET.UID3 = 0xE00267C2 } - webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll + webkitlibs.sources = $$QMAKE_LIBDIR_QT/QtWebKit$${QT_LIBINFIX}.dll webkitlibs.path = /sys/bin vendorinfo = \ "; Localised Vendor name" \ |