diff --git a/src/engine/texturehelper.cpp b/src/engine/texturehelper.cpp
index 11457e6..7d3d038 100644
--- a/src/engine/texturehelper.cpp
+++ b/src/engine/texturehelper.cpp
@@ -1,134 +1,133 @@
 /***************************************************************************
  *   Copyright 2009, 2010 Stefan Majewsky <majewsky@gmx.net>
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public
  *   License as published by the Free Software Foundation; either
  *   version 2 of the License, or (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ***************************************************************************/
 
 #include "texturehelper.h"
 #include "settings.h"
 
 #include <QDir>
 #include <QDirIterator>
 #include <QGraphicsScene>
 #include <QPainter>
 #include <KLocalizedString>
 #include <QSvgRenderer>
 
 const QSize Palapeli::TextureHelper::DefaultThumbnailSize(32, 32);
 const QSize Palapeli::TextureHelper::DefaultPixmapSize(128, 128);
 
 Palapeli::TextureHelper* Palapeli::TextureHelper::instance()
 {
 	static Palapeli::TextureHelper instance;
 	return &instance;
 }
 
 QPixmap Palapeli::TextureHelper::render(const QString& filePath)
 {
 	QPixmap pixmap;
 	if (filePath.endsWith(QLatin1String(".svg")))
 	{
 		QSvgRenderer renderer(filePath);
 		pixmap = QPixmap(DefaultPixmapSize);
 		pixmap.fill(Qt::transparent);
 		QPainter painter(&pixmap);
 		renderer.render(&painter);
 		painter.end();
 	}
 	else
 		pixmap.load(filePath);
 	return pixmap;
 }
 
 Palapeli::TextureHelper::TextureHelper()
 	: m_currentIndex(-1)
 {
 	//create menu item for solid color
 	QPixmap colorThumbnail(DefaultThumbnailSize);
 	colorThumbnail.fill(Qt::transparent);
 	QStandardItem* colorItem = new QStandardItem;
 	colorItem->setData(QLatin1String("__color__"), IdentifierRole);
 	colorItem->setData(colorThumbnail, Qt::DecorationRole);
 	colorItem->setData(i18nc("@item:inlistbox", "Single color"), Qt::DisplayRole);
 	appendRow(colorItem);
 	//fetch backgrounds, and create menu items
 	const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppLocalDataLocation,
 													   "backgrounds",
 													   QStandardPaths::LocateDirectory);
 	foreach (const QString& dir, dirs)
 	{
 		QDirIterator dirIt(dir, QDir::Files);
 		while (dirIt.hasNext())
 		{
 			const QString filePath = dirIt.next();
 			const QString fileName = dirIt.fileName();
 			//create item for this brush
 			const QPixmap pixmap = render(filePath);
 			if (pixmap.isNull())
 				continue;
 			QStandardItem* item = new QStandardItem;
 			item->setData(pixmap, BrushRole);
 			item->setData(fileName, IdentifierRole);
 			item->setData(pixmap.scaled(DefaultThumbnailSize, Qt::KeepAspectRatio), Qt::DecorationRole);
 			item->setData(fileName, Qt::DisplayRole);
 			appendRow(item);
 		}
 	}
 	//select initial brush
 	readSettings();
 }
 
 int Palapeli::TextureHelper::currentIndex() const
 {
 	return m_currentIndex;
 }
 
 void Palapeli::TextureHelper::readSettings()
 {
 	//read config
 	const QString selectedBackground = Settings::viewBackground();
 	const QColor selectedColor = Settings::viewBackgroundColor();
 	for (int i = 0; i < rowCount(); ++i)
 	{
 		QStandardItem* item = this->item(i);
 		if (item->data(IdentifierRole) != selectedBackground)
 			continue;
 		//use this brush
 		m_currentIndex = i;
 		if (selectedBackground == QLatin1String("__color__"))
 			m_currentBrush = selectedColor;
 		else
 			m_currentBrush = item->data(BrushRole).value<QPixmap>();
-		foreach (QGraphicsScene* scene, m_scenes)
-			scene->setBackgroundBrush(m_currentBrush);
+		foreach (QObject* scene, m_scenes)
+			static_cast<QGraphicsScene*>(scene)->setBackgroundBrush(m_currentBrush);
 	}
 }
 
 void Palapeli::TextureHelper::addScene(QGraphicsScene* scene)
 {
 	if (!scene || m_scenes.contains(scene))
 		return;
 	m_scenes << scene;
 	scene->setBackgroundBrush(m_currentBrush);
 	connect(scene, SIGNAL(destroyed(QObject*)), SLOT(removeScene(QObject*)));
 }
 
 void Palapeli::TextureHelper::removeScene(QObject* scene)
 {
-	//called by scene->QObject::destroyed signal, so qobject_cast won't work anymore
-	m_scenes.removeAll(static_cast<QGraphicsScene*>(scene));
+	m_scenes.removeAll(scene);
 }
 
 
diff --git a/src/engine/texturehelper.h b/src/engine/texturehelper.h
index 98b5d30..25d542c 100644
--- a/src/engine/texturehelper.h
+++ b/src/engine/texturehelper.h
@@ -1,56 +1,56 @@
 /***************************************************************************
  *   Copyright 2009, 2010 Stefan Majewsky <majewsky@gmx.net>
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public
  *   License as published by the Free Software Foundation; either
  *   version 2 of the License, or (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ***************************************************************************/
 
 #ifndef PALAPELI_TEXTUREHELPER_H
 #define PALAPELI_TEXTUREHELPER_H
 
 class QGraphicsScene;
 #include <QStandardItemModel>
 
 namespace Palapeli
 {
 	//NOTE: Singleton, needs to be initialized in main().
 	class TextureHelper : public QStandardItemModel
 	{
 		Q_OBJECT
 		public:
 			enum CustomRoles {
 				BrushRole = Qt::UserRole + 1,
 				IdentifierRole = Qt::UserRole + 2
 			};
 
 			static Palapeli::TextureHelper* instance();
 			int currentIndex() const;
 		public Q_SLOTS:
 			void readSettings();
 			void addScene(QGraphicsScene* scene);
 			void removeScene(QObject* object);
 		private:
 			TextureHelper();
 			static QPixmap render(const QString& filePath);
 
-			QList<QGraphicsScene*> m_scenes;
+			QList<QObject*> m_scenes;
 			int m_currentIndex;
 			QBrush m_currentBrush;
 
 			static const QSize DefaultThumbnailSize;
 			static const QSize DefaultPixmapSize;
 	};
 }
 
 #endif // PALAPELI_TEXTUREHELPER_H