|
|
SVN commit 776659 by rdale:
* Add the webkit headers and make the Smoke lib link against libQtWebKit
CCMAIL: kde-bindings@xxxxxxx
M +1 -0 kalyptus/kalyptus
M +2 -0 smoke/qt/CMakeLists.txt
M +7 -0 smoke/qt/header_list
--- trunk/KDE/kdebindings/kalyptus/kalyptus #776658:776659
@@ -594,6 +594,7 @@
$p =~
m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
$p =~
m/^#if\s*defined\(Q_INTERNAL_QAPP_SRC\)/ or
($p =~ m/^#if\s*QT_VERSION\s*<\s*0x040000/
and $qt4) or
+ ($p =~ m/^#if\s*QT_VERSION\s*<\s*0x040400/
and $qt4) or
&$match_qt_defines( $p ) or
$p =~ m/^#\s*if\s+0\s+/ ) {
my $if_depth = 1;
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #776658:776659
@@ -104,6 +104,7 @@
SET(QT_USE_QTSVG ${QT_QTSVG_FOUND})
SET(QT_USE_QTUITOOLS ${QT_QTUITOOLS_FOUND})
SET(QT_USE_QT3SUPPORT ${QT_QT3SUPPORT_FOUND})
+SET(QT_USE_QTWEBKIT ${QT_QTWEBKIT_FOUND})
#SET(QT_USE_QTDBUS ${QT_QTDBUS_FOUND)
# The above line doesn't work with cmake 2.4.6, but should be fixed in later
versions
@@ -132,6 +133,7 @@
${QT_QTSVG_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
${QT_QTXML_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
${_smokeqt_optional_libs} )
set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
--- trunk/KDE/kdebindings/smoke/qt/header_list #776658:776659
@@ -330,3 +330,10 @@
qsslsocket.h
qsvggenerator.h
qxmlstream.h
+qwebframe.h
+qwebhistory.h
+qwebhistoryinterface.h
+qwebkitglobal.h
+qwebpage.h
+qwebsettings.h
+qwebview.h
|
|