diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
| commit | 5fa83d8e2ad78272a1013c45387adffb5e551357 (patch) | |
| tree | 49f0362e1bbf03f668077dfc18a66342bb03ac39 /src/3rdparty | |
| parent | 7274f7f9cc21beeddb01adadc7eb79ed61459802 (diff) | |
| parent | 5a024622db5dd7d9fb23202500da13813c28224b (diff) | |
| download | Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.zip Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.tar.gz Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix desktopservices demo missing icon in Symbian
Fix path removal from target in Symbian builds
Fix compilation errors in tst_qfileinfo
Symbian (installation) docs.
Make 'make sis' recursive again.
Fix libinfix usage
Make symbian-resource files aware of libInfix configure feature
Update symbian def files for 4.7
Correction to EGL stub implementation
Fix 'make sis' when media services is disabled and multimedia is not
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 276ca04..3dfe803 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -55,8 +55,6 @@ CONFIG(standalone_package) { isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h - - symbian: TARGET += $${QT_LIBINFIX} } else { isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated @@ -76,6 +74,7 @@ CONFIG(QTDIR_build) { VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} DESTDIR = $$OUTPUT_DIR/lib !static: DEFINES += QT_MAKEDLL + symbian: TARGET +=$${QT_LIBINFIX} } unix { |