[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2009-05-14 5:05:14
Message-ID: 1242277514.750632.23653.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967817 by bcooksley:

If we are being deleted, then we need to clear the pointer so we get created anew again when needed.
BUG: 192567

 M  +4 -0      CMakeLists.txt  
 M  +1 -1      core/ToolTipManager.cpp  
 M  +1 -0      core/ToolTips/KToolTipManager.cpp  


--- trunk/KDE/kdebase/workspace/systemsettings/CMakeLists.txt #967816:967817
@@ -1,5 +1,9 @@
 PROJECT (systemsettings)
 
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
 ADD_SUBDIRECTORY(core)
--- trunk/KDE/kdebase/workspace/systemsettings/core/ToolTipManager.cpp #967816:967817
@@ -96,7 +96,7 @@
                 const QPoint pos = d->view->viewport()->mapToGlobal(d->itemRect.topLeft());
                 d->itemRect.moveTo(pos);
                 d->item = index;
-                d->timer->start(500);
+                d->timer->start(100);
             }
             return ( index != QModelIndex() );
         }
--- trunk/KDE/kdebase/workspace/systemsettings/core/ToolTips/KToolTipManager.cpp #967816:967817
@@ -33,6 +33,7 @@
 {
     delete label;
     delete currentItem;
+    s_instance = 0;
 }
 
 void KToolTipManager::showTip(const QPoint &pos, KToolTipItem *item)
[prev in list] [next in list] [prev in thread] [next in thread]