From: Laurent Montel Date: Mon, 7 May 2007 07:27:26 +0000 (+0000) Subject: Adapt to new konsole api X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a4713e9ea4e7af747f4a406f68c907c1f09aac95?ds=sidebyside Adapt to new konsole api svn path=/trunk/KDE/kdebase/apps/; revision=661990 --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54e59583d..5cf2676c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,8 @@ add_subdirectory( pics ) add_subdirectory( servicemenus ) -include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/apps/konsole/src/ + ) add_definitions (-DQT3_SUPPORT) diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp index 2d2b3a5bb..ff410711c 100644 --- a/src/terminalsidebarpage.cpp +++ b/src/terminalsidebarpage.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include @@ -61,7 +61,7 @@ void TerminalSidebarPage::showEvent(QShowEvent* event) // m_terminal = static_cast(part->qt_cast("TerminalInterface")); // which does not work anymore in Qt4. As temporary workaround is // included directly: - m_terminal = static_cast(reinterpret_cast(part)); + m_terminal = static_cast(reinterpret_cast(part)); } } if (m_terminal != 0) {