Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

4 files changed, 11 insertions, 0 deletions

diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 385ad04..6f8ec29 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -265,6 +265,7 @@ class QListViewToolTip : public QToolTip
 {
 public:
     QListViewToolTip( QWidget *parent, QListView *lv );
+    virtual ~QListViewToolTip();
 
     void maybeTip( const QPoint &pos );
 
@@ -278,6 +279,10 @@ QListViewToolTip::QListViewToolTip( QWidget *parent, QListView *lv )
 {
 }
 
+QListViewToolTip::~QListViewToolTip()
+{
+}
+
 void QListViewToolTip::maybeTip( const QPoint &pos )
 {
     if ( !parentWidget() || !view || !view->showToolTips() )
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 086c423..8821537 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -1391,6 +1391,7 @@ void QPopupMenu::show()
     performDelayedChanges();
     updateSize(TRUE);
     QWidget::show();
+    updateSize();
     popupActive = -1;
     if(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this))
 	d->mouseMoveBuffer = QRegion();
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index ed1a34e..f4ed6f4 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -824,6 +824,10 @@ QToolTip::QToolTip( QWidget * widget, QToolTipGroup * group )
 		     QString::null, g, QString::null, this, FALSE );
 }
 
+QToolTip::~QToolTip()
+{
+}
+
 
 /*!
     Adds a tool tip to \a widget. \a text is the text to be shown in
diff --git a/src/widgets/qtooltip.h b/src/widgets/qtooltip.h
index 2cd38c1..3146d7e 100644
--- a/src/widgets/qtooltip.h
+++ b/src/widgets/qtooltip.h
@@ -92,6 +92,7 @@ class Q_EXPORT QToolTip: public Qt
 {
 public:
     QToolTip( QWidget *, QToolTipGroup * = 0 );
+    virtual ~QToolTip();
     //### add virtual d'tor for 4.0
 
     static void add( QWidget *, const QString &);