SVN commit 996131 by ppenz: Forward port for SVN commit 996129: Fix possible crash when no current item is given. Thanks to Martin Koller for the patch! CCBUG: 198805 CCBUG: 200037 M +15 -15 CMakeLists.txt M +3 -0 dolphin/src/tooltips/ktooltip.cpp --- trunk/KDE/kdebase/apps/CMakeLists.txt #996130:996131 @@ -18,28 +18,28 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/lib/konq ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) -add_subdirectory( lib ) +#add_subdirectory( lib ) add_subdirectory( dolphin ) -add_subdirectory( kwrite ) -add_subdirectory( kdialog ) -add_subdirectory( keditbookmarks ) -add_subdirectory( konqueror ) -add_subdirectory( kfind ) -add_subdirectory( kappfinder ) -add_subdirectory( plasma ) +#add_subdirectory( kwrite ) +#add_subdirectory( kdialog ) +#add_subdirectory( keditbookmarks ) +#add_subdirectory( konqueror ) +#add_subdirectory( kfind ) +#add_subdirectory( kappfinder ) +#add_subdirectory( plasma ) if ( Q_WS_MAC ) - add_subdirectory( konsole ) - add_subdirectory( kdepasswd ) +# add_subdirectory( konsole ) +# add_subdirectory( kdepasswd ) endif ( Q_WS_MAC ) if ( Q_WS_X11 ) - add_subdirectory( kinfocenter ) - add_subdirectory( nsplugins ) - add_subdirectory( konsole ) - add_subdirectory( kdepasswd ) +# add_subdirectory( kinfocenter ) +# add_subdirectory( nsplugins ) +# add_subdirectory( konsole ) +# add_subdirectory( kdepasswd ) endif ( Q_WS_X11 ) -macro_optional_add_subdirectory( doc ) +#macro_optional_add_subdirectory( doc ) if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") macro_display_feature_log() --- trunk/KDE/kdebase/apps/dolphin/src/tooltips/ktooltip.cpp #996130:996131 @@ -88,6 +88,9 @@ void KTipLabel::paintEvent(QPaintEvent*) { + if (!m_currentItem) + return; + KStyleOptionToolTip option = styleOption(); option.rect = rect();