diff --git a/exe/qtlua/packages/qtgui/CMakeLists.txt b/exe/qtlua/packages/qtgui/CMakeLists.txt index dbb22b35..6783ed13 100644 --- a/exe/qtlua/packages/qtgui/CMakeLists.txt +++ b/exe/qtlua/packages/qtgui/CMakeLists.txt @@ -1,6 +1,10 @@ # -*- cmake -*- -SET(QT_USE_QTWEBKIT 1) +IF (QT_QTWEBKIT_FOUND) + SET(QT_USE_QTWEBKIT 1) + SET(QT_USE_QTNETWORK 1) + ADD_DEFINITIONS("-DHAVE_QTWEBKIT=1") +ENDIF (QT_QTWEBKIT_FOUND) INCLUDE(${QT_USE_FILE}) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/exe/qtlua/packages/qtgui/qtgui.cpp b/exe/qtlua/packages/qtgui/qtgui.cpp index 0e2abc88..3331c20d 100644 --- a/exe/qtlua/packages/qtgui/qtgui.cpp +++ b/exe/qtlua/packages/qtgui/qtgui.cpp @@ -44,8 +44,9 @@ #include #include #include +#if HAVE_QTWEBKIT #include - +#endif Q_DECLARE_METATYPE(QGradient) Q_DECLARE_METATYPE(QPainterPath) @@ -1961,6 +1962,7 @@ do_hook(qtransform) // ======================================== // QWEBVIEW +#if HAVE_QTWEBKIT static int qwebview_new(lua_State *L) @@ -1999,7 +2001,7 @@ static struct luaL_Reg qwebview_lib[] = { do_qhook(qwebview) - +#endif // ======================================== // QWIDGET @@ -2441,7 +2443,9 @@ luaopen_libqtgui(lua_State *L) HOOK_QVARIANT(QPen, qpen); HOOK_QOBJECT(QtLuaAction, qtluaaction); HOOK_QVARIANT(QTransform, qtransform); +#if HAVE_QTWEBKIT HOOK_QOBJECT(QWebView, qwebview); +#endif HOOK_QOBJECT(QWidget, qwidget); return 0;