summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro')
-rw-r--r--src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
index 6c8246e7b4..105a124c41 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
+++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
@@ -208,7 +208,7 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
}
contains(DEFINES, ENABLE_VIDEO=1) {
- !contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) {
+ !contains(DEFINES, USE_QTKIT=1):!contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) {
HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h
SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp
}
@@ -217,6 +217,24 @@ contains(DEFINES, ENABLE_VIDEO=1) {
HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h
SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp
}
+
+ contains(DEFINES, USE_QTKIT=1) {
+ INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/
+ INCLUDEPATH += $$SOURCE_DIR/../WebKitLibraries/
+ DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+ HEADERS += $$PWD/WebCoreSupport/WebSystemInterface.h
+ SOURCES += $$PWD/WebCoreSupport/WebSystemInterface.mm
+ # We can know the Mac OS version by using the Darwin major version
+ DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
+ DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
+ equals(DARWIN_MAJOR_VERSION, "10") {
+ LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a -framework Security
+ } else {
+ equals(DARWIN_MAJOR_VERSION, "9") {
+ LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a -framework Security
+ }
+ }
+ }
}
contains(DEFINES, ENABLE_ICONDATABASE=1) {