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

4 files changed, 11 insertions, 0 deletions

diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index 7a325ade4..94feb9bfd 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -92,6 +92,7 @@ class Q_EXPORT TQToolTip: public TQt
 {
 public:
     TQToolTip( TQWidget *, TQToolTipGroup * = 0 );
+    virtual ~TQToolTip();
     //### add virtual d'tor for 4.0
 
     static void add( TQWidget *, const TQString &);
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 37d3b0d2c..111e6daf3 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -265,6 +265,7 @@ class TQListViewToolTip : public TQToolTip
 {
 public:
     TQListViewToolTip( TQWidget *parent, TQListView *lv );
+    virtual ~TQListViewToolTip();
 
     void maybeTip( const TQPoint &pos );
 
@@ -278,6 +279,10 @@ TQListViewToolTip::TQListViewToolTip( TQWidget *parent, TQListView *lv )
 {
 }
 
+TQListViewToolTip::~TQListViewToolTip()
+{
+}
+
 void TQListViewToolTip::maybeTip( const TQPoint &pos )
 {
     if ( !parentWidget() || !view || !view->showToolTips() )
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index afff582b5..4b129e8e0 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -1391,6 +1391,7 @@ void TQPopupMenu::show()
     performDelayedChanges();
     updateSize(TRUE);
     TQWidget::show();
+    updateSize();
     popupActive = -1;
     if(style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this))
 	d->mouseMoveBuffer = TQRegion();
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index 924d563d7..b6826a816 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -824,6 +824,10 @@ TQToolTip::TQToolTip( TQWidget * widget, TQToolTipGroup * group )
 		     TQString::null, g, TQString::null, this, FALSE );
 }
 
+TQToolTip::~TQToolTip()
+{
+}
+
 
 /*!
     Adds a tool tip to \a widget. \a text is the text to be shown in