diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 5adfde19042016692a5d3352c03fa18770f6c6e8..4d952fd18e4ad15bd005f238c9e799a225b4222c 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -105,11 +105,9 @@ EditorView::EditorView(OpenEditorsModel *model, QWidget *parent) :
m_toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_lockButton->setAutoRaise(true);
- m_lockButton->setProperty("type", QLatin1String("dockbutton"));
m_closeButton->setAutoRaise(true);
m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
- m_closeButton->setProperty("type", QLatin1String("dockbutton"));
QHBoxLayout *toplayout = new QHBoxLayout;
toplayout->setSpacing(0);
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 249073cd1e7baba8239f1c093189271869d5201e..0dc130d845e0820f341fdd796510864db67bbcaf 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -196,7 +196,6 @@ MainWindow::MainWindow() :
connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)),
this, SLOT(updateFocusWidget(QWidget*,QWidget*)));
// Add a small Toolbutton for toggling the navigation widget
- m_toggleSideBarButton->setProperty("type", QLatin1String("dockbutton"));
statusBar()->insertPermanentWidget(0, m_toggleSideBarButton);
// setUnifiedTitleAndToolBarOnMac(true);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index e7fb976a8e0db9cc62cac3bc758945d349d6601b..cbff6256393a7eee6ef59f766f336816de872343 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -31,7 +31,6 @@
#include "styleanimator.h"
-#include <QtCore/QDebug>
#include <QtCore/QLibrary>
#include <utils/qtcassert.h>
@@ -100,8 +99,6 @@ public:
{
style = QStyleFactory::create(baseStyleName);
QTC_ASSERT(style, /**/);
- buttonImage_pressed = QImage(":/core/images/pushbutton_pressed.png");
- buttonImage = QImage(":/core/images/pushbutton.png");
lineeditImage = QImage(":/core/images/inputfield.png");
lineeditImage_disabled = QImage(":/core/images/inputfield_disabled.png");
@@ -117,8 +114,6 @@ public:
public:
QStyle *style;
- QImage buttonImage;
- QImage buttonImage_pressed;
QImage lineeditImage;
QImage lineeditImage_disabled;
@@ -907,7 +902,6 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
switch (control) {
case CC_ToolButton:
if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
- QString buttonType = widget->property("type").toString();
QRect button, menuarea;
button = subControlRect(control, toolbutton, SC_ToolButton, widget);
menuarea = subControlRect(control, toolbutton, SC_ToolButtonMenu, widget);
@@ -930,24 +924,9 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
QStyleOption tool(0);
tool.palette = toolbutton->palette;
if (toolbutton->subControls & SC_ToolButton) {
- if (buttonType == "dockbutton") {
- tool.rect = button;
- tool.state = bflags;
- drawPrimitive(PE_PanelButtonTool, &tool, painter, widget);
- } else { // paint status bar button style
- if (bflags & State_Sunken || bflags & State_On)
- drawCornerImage(d->buttonImage_pressed, painter, option->rect, 2, 2, 2, 2);
- else if (bflags & State_Enabled) {
-#ifndef Q_WS_MAC
- if (bflags & State_MouseOver) {
- drawCornerImage(d->buttonImage, painter, option->rect, 2, 2, 2, 2);
- QColor shade(255, 255, 255, 50);
- painter->fillRect(button.adjusted(1, 1, -1, -1), shade);
- }
-#endif
- }
-
- }
+ tool.rect = button;
+ tool.state = bflags;
+ drawPrimitive(PE_PanelButtonTool, &tool, painter, widget);
}
if (toolbutton->state & State_HasFocus) {
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 5b231bb4bd9b8178ab9abc07104958ee674d416c..44cf905b35708d0d9049b7d2daf5019ea839f4e7 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -383,9 +383,6 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
toolBarLayout->addWidget(splitAction);
toolBarLayout->addWidget(close);
- splitAction->setProperty("type", QLatin1String("dockbutton"));
- close->setProperty("type", QLatin1String("dockbutton"));
-
QVBoxLayout *lay = new QVBoxLayout();
lay->setMargin(0);
lay->setSpacing(0);
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index b47b2f3ae76afa4fc990d31bd598bda985778341..7033ffd6857be7852cb5bf1fe0f4b6fc79cc05a7 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -177,18 +177,15 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
m_nextAction = new QAction(this);
m_nextAction->setIcon(QIcon(":/core/images/next.png"));
- m_nextAction->setProperty("type", QLatin1String("dockbutton"));
m_nextAction->setText(tr("Next Item"));
connect(m_nextAction, SIGNAL(triggered()), this, SLOT(slotNext()));
m_prevAction = new QAction(this);
m_prevAction->setIcon(QIcon(":/core/images/prev.png"));
- m_prevAction->setProperty("type", QLatin1String("dockbutton"));
m_prevAction->setText(tr("Previous Item"));
connect(m_prevAction, SIGNAL(triggered()), this, SLOT(slotPrev()));
m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
- m_closeButton->setProperty("type", QLatin1String("dockbutton"));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide()));
QVBoxLayout *mainlayout = new QVBoxLayout;
@@ -201,10 +198,8 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
toolLayout->addWidget(m_widgetComboBox);
toolLayout->addWidget(m_clearButton);
m_prevToolButton = new QToolButton;
- m_prevToolButton->setProperty("type", QLatin1String("dockbutton"));
toolLayout->addWidget(m_prevToolButton);
m_nextToolButton = new QToolButton;
- m_nextToolButton->setProperty("type", QLatin1String("dockbutton"));
toolLayout->addWidget(m_nextToolButton);
toolLayout->addWidget(m_opToolBarWidgets);
toolLayout->addWidget(m_closeButton);
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 45e8712fd66ab05072749f7c86c14ce8714f630c..b637f24e85d28d504d70b1ccd6cdfb9df08e2e29 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -237,13 +237,11 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &title)
m_toolbar->addWidget(m_comboBox);
m_splitButton = new QToolButton;
- m_splitButton->setProperty("type", QLatin1String("dockbutton"));
m_splitButton->setIcon(QIcon(":/core/images/splitbutton_horizontal.png"));
m_splitButton->setToolTip(tr("Split"));
connect(m_splitButton, SIGNAL(clicked(bool)), this, SIGNAL(split()));
m_closeButton = new QToolButton;
- m_closeButton->setProperty("type", QLatin1String("dockbutton"));
m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
m_closeButton->setToolTip(tr("Close"));
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 6289b50f28a6bda99d56199608bab534e4e8bd0a..2e8df6b263cfc99721314423b8927465ed9b5c95 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -82,16 +82,9 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
connect(m_ui.findEdit, SIGNAL(editingFinished()), this, SLOT(invokeResetIncrementalSearch()));
- m_ui.close->setProperty("type", QLatin1String("dockbutton"));
m_ui.close->setIcon(QIcon(":/core/images/closebutton.png"));
connect(m_ui.close, SIGNAL(clicked()), this, SLOT(hideAndResetFocus()));
- m_ui.findPreviousButton->setProperty("type", QLatin1String("dockbutton"));
- m_ui.findNextButton->setProperty("type", QLatin1String("dockbutton"));
- m_ui.replacePreviousButton->setProperty("type", QLatin1String("dockbutton"));
- m_ui.replaceNextButton->setProperty("type", QLatin1String("dockbutton"));
- m_ui.replaceAllButton->setProperty("type", QLatin1String("dockbutton"));
-
m_findCompleter->setModel(m_plugin->findCompletionModel());
m_replaceCompleter->setModel(m_plugin->replaceCompletionModel());
m_ui.findEdit->setCompleter(m_findCompleter);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index fb1f5cf1bb0c387f71ebb400f877f9e959ecc94b..3f78714a70c1379fbeb4141033f425b5b68f9a41 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -448,7 +448,6 @@ void HelpPlugin::createRightPaneSideBar()
SLOT(rightPaneForward()));
QToolButton *closeButton = new QToolButton();
- closeButton->setProperty("type", QLatin1String("dockbutton"));
closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
// Dummy layout to align the close button to the right
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index fe351913fea39efdff0a6dca7bd465e90e1f58f5..4f7b348da5089f4c2e0497b5f2e1b6d4f5075b11 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -204,7 +204,6 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget()
FolderNavigationWidget *ptw = new FolderNavigationWidget;
n.widget = ptw;
QToolButton *toggleSync = new QToolButton;
- toggleSync->setProperty("type", "dockbutton");
toggleSync->setIcon(QIcon(":/core/images/linkicon.png"));
toggleSync->setCheckable(true);
toggleSync->setChecked(ptw->autoSynchronization());
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 486075eb16fee524fac5db35d376ddffba5c2a58..6b6ca87131138965720efa474ba8d3540e0d39c4 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -162,7 +162,6 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent)
this, SLOT(startupProjectChanged(ProjectExplorer::Project *)));
m_toggleSync = new QToolButton;
- m_toggleSync->setProperty("type", "dockbutton");
m_toggleSync->setIcon(QIcon(":/core/images/linkicon.png"));
m_toggleSync->setCheckable(true);
m_toggleSync->setChecked(autoSynchronization());
@@ -372,7 +371,6 @@ Core::NavigationView ProjectTreeWidgetFactory::createWidget()
n.widget = ptw;
QToolButton *filter = new QToolButton;
- filter->setProperty("type", "dockbutton");
filter->setIcon(QIcon(":/projectexplorer/images/filtericon.png"));
filter->setToolTip(tr("Filter tree"));
filter->setPopupMode(QToolButton::InstantPopup);
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 3a8b84d4c5bbc740757e5d30b67b335cc8f76bb4..0f085e8b67f66c010b27eea17a72a59ddb6292f2 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -314,7 +314,6 @@ static QToolButton *createFilterButton(ProjectExplorer::BuildParserInterface::Pa
{
QToolButton *button = new QToolButton;
button->setIcon(model->iconFor(type));
- button->setProperty("type", "dockbutton");
button->setToolTip(toolTip);
button->setCheckable(true);
button->setChecked(true);