qt-copy/patches

SVN commit 683151 by djarvie:

Fix crash when 'w' is null

CCMAIL: kwinkde.org

 M  +5 -4      0178-transparency-window-types.diff  


---
trunk/qt-copy/patches/0178-transparency-window-types.diff
#683150:683151
 -70,7
+70,7 
      bool isWindowModified() const;
  #ifndef QT_NO_TOOLTIP
 --- src/gui/kernel/qtooltip.cpp.sav	2007-05-09
11:43:46.000000000 +0200
-+++ src/gui/kernel/qtooltip.cpp	2007-05-31
14:15:28.000000000 +0200
++++ src/gui/kernel/qtooltip.cpp	2007-07-04
10:15:28.000000000 +0100
  -134,6 +134,9  QTipLabel::QTipLabel(const QPoint
&pos, 
      setMouseTracking(true);
      fadingOut = false;
 -81,17
+81,18 
  }
  
  void QTipLabel::restartHideTimer()
- -351,6 +354,9  void QToolTip::showText(const QPoint
&po
+ -351,6 +354,10  void QToolTip::showText(const QPoint
&po
              // that is showing (removes flickering)
              if (QTipLabel::instance->tipChanged(pos,
text, w)){
                  QTipLabel::instance->reuseTip(text);
 +#ifdef Q_WS_X11
-+               
QTipLabel::instance->x11SetWindowTransient(
w->topLevelWidget());
++                if (w)
++                   
QTipLabel::instance->x11SetWindowTransient(
w->topLevelWidget());
 +#endif
                  QTipLabel::instance->setTipRect(w,
rect);
                  QTipLabel::instance->placeTip(pos, w);
              }
- -360,6 +366,9  void QToolTip::showText(const QPoint
&po
+ -360,6 +367,9  void QToolTip::showText(const QPoint
&po
  
      if (!text.isEmpty()){ // no tip can be reused, create
new tip:
          new QTipLabel(pos, text, w); // sets
QTipLabel::instance to itself
_______________________________________________
Kwin mailing list
Kwinkde.org
https://ma
il.kde.org/mailman/listinfo/kwin