diff options
Diffstat (limited to 'Source/WebKit/qt/QtWebKit.pro')
| -rw-r--r-- | Source/WebKit/qt/QtWebKit.pro | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Source/WebKit/qt/QtWebKit.pro b/Source/WebKit/qt/QtWebKit.pro index 8836c4a..7529ace 100644 --- a/Source/WebKit/qt/QtWebKit.pro +++ b/Source/WebKit/qt/QtWebKit.pro @@ -31,6 +31,7 @@ include($$SOURCE_DIR/JavaScriptCore/JavaScriptCore.pri) webkit2 { include($$SOURCE_DIR/WebKit2/WebKit2.pri) include($$SOURCE_DIR/WebKit2/WebKit2API.pri) + INCLUDEPATH += $$OUTPUT_DIR/WebKit2/generated } include($$SOURCE_DIR/WebCore/WebCore.pri) @@ -104,6 +105,11 @@ symbian { } else { TARGET.UID3 = 0xE00267C2 } + + sisheader = "; SIS header: name, uid, version" \ + "$${LITERAL_HASH}{\"$$TARGET\"},($$TARGET.UID3),$$QT_WEBKIT_MAJOR_VERSION,$$QT_WEBKIT_MINOR_VERSION,$$QT_WEBKIT_PATCH_VERSION,TYPE=SA,RU" + webkitsisheader.pkg_prerules = sisheader + webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll v8:webkitlibs.sources += v8.dll @@ -128,7 +134,7 @@ symbian { DEPLOYMENT += declarativeImport } - DEPLOYMENT += webkitlibs webkitbackup + DEPLOYMENT += webkitsisheader webkitlibs webkitbackup !CONFIG(production):CONFIG-=def_files # Need to build these sources here because of exported symbols @@ -211,13 +217,13 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) { contains(DEFINES, ENABLE_VIDEO=1) { !contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) { - HEADERS += \ - $$PWD/WebCoreSupport/FullScreenVideoQt.h \ - $$PWD/WebCoreSupport/FullScreenVideoWidget.h + HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h + SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp + } - SOURCES += \ - $$PWD/WebCoreSupport/FullScreenVideoQt.cpp \ - $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp + contains(DEFINES, USE_GSTREAMER=1) | contains(MOBILITY_CONFIG, multimedia) { + HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h + SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp } } @@ -322,7 +328,7 @@ contains(CONFIG, texmap) { CONFIG += build_all } else { - debug_and_release:TARGET = $$qtLibraryTarget($$TARGET) + isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET) } CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework |