X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FIconPalette.cpp;h=47373e8b7b7802062797bfe2f8bd0952a9438ffa;hb=161f7b7f62cb33dab681add6c5b5b68a887e2ea1;hp=af4d9db098310b2c94b0d2006a8c56d7c12f81e8;hpb=703756f99c0d7bc115b97fbf96e3e153f512a2b5;p=lyx.git

diff --git a/src/frontends/qt4/IconPalette.cpp b/src/frontends/qt4/IconPalette.cpp
index af4d9db098..47373e8b7b 100644
--- a/src/frontends/qt4/IconPalette.cpp
+++ b/src/frontends/qt4/IconPalette.cpp
@@ -111,8 +111,6 @@ void IconPalette::addButton(QAction * action)
 	QToolButton * tb = new QToolButton;
 	tb->setAutoRaise(true);
 	tb->setDefaultAction(action);
-	QToolButton * pb = qobject_cast<QToolButton *>(parentWidget());
-	tb->setIconSize(pb->iconSize());
 	// trigger tooltip (children of popups do not receive mousemove events)
 	tb->setMouseTracking(true);
 
@@ -121,6 +119,7 @@ void IconPalette::addButton(QAction * action)
 	QToolBar * toolbar = qobject_cast<QToolBar *>(parentWidget()->parentWidget());
 	connect(toolbar, SIGNAL(iconSizeChanged(const QSize &)),
 		tb, SLOT(setIconSize(const QSize &)));
+	tb->setIconSize(toolbar->iconSize());
 
 	int const i = actions_.size();
 	int const ncols = qMin(6, i);
@@ -266,4 +265,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"