Use push button instead of tool button.

Looks really ugly on Mac otherwise.

Change-Id: I062f5ab4a585c88db4a955079545ff023e677ea4
Reviewed-on: http://codereview.qt.nokia.com/1932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

diff --git a/src/plugins/texteditor/fallbackselectorwidget.cpp b/src/plugins/texteditor/fallbackselectorwidget.cpp
index 8abacb0..dfe3d46 100644 (file)
--- a/src/plugins/texteditor/fallbackselectorwidget.cpp
+++ b/src/plugins/texteditor/fallbackselectorwidget.cpp
@@ -37,7 +37,7 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QCheckBox>
-#include <QtGui/QToolButton>
+#include <QtGui/QPushButton>
 #include <QtGui/QMenu>
 #include <QtCore/QTextStream>
 #include <QtCore/QSignalMapper>
@@ -81,7 +81,7 @@ void FallbackSelectorWidget::setFallbackPreferences(TextEditor::IFallbackPrefere
 
         m_layout = new QHBoxLayout(this);
         m_layout->setContentsMargins(QMargins());
-        m_restoreButton = new QToolButton(this);
+        m_restoreButton = new QPushButton(this);
         QSignalMapper *mapper = new QSignalMapper(this);
 
         m_comboBoxLabel = new QLabel(m_labelText, this);
@@ -101,7 +101,6 @@ void FallbackSelectorWidget::setFallbackPreferences(TextEditor::IFallbackPrefere
             mapper->setMapping(m_restoreButton, fallback);
         } else {
             m_restoreButton->setText(tr("Restore"));
-            m_restoreButton->setPopupMode(QToolButton::InstantPopup);
             m_restoreButton->setMenu(menu);
         }
 

diff --git a/src/plugins/texteditor/fallbackselectorwidget.h b/src/plugins/texteditor/fallbackselectorwidget.h
index 205b4a6..dca776d 100644 (file)
--- a/src/plugins/texteditor/fallbackselectorwidget.h
+++ b/src/plugins/texteditor/fallbackselectorwidget.h
@@ -43,7 +43,7 @@ class QHBoxLayout;
 class QComboBox;
 class QLabel;
 class QCheckBox;
-class QToolButton;
+class QPushButton;
 QT_END_NAMESPACE
 
 namespace TextEditor {
@@ -76,7 +76,7 @@ private:
 
     QComboBox *m_comboBox;
     QLabel *m_comboBoxLabel;
-    QToolButton *m_restoreButton;
+    QPushButton *m_restoreButton;
 
     bool m_fallbackWidgetVisible;
     QString m_labelText;