--- qsampler/trunk/src/qsamplerDeviceForm.cpp	2009/02/19 11:44:57	1840
+++ qsampler/trunk/src/qsamplerDeviceForm.cpp	2012/12/29 00:21:11	2387
@@ -1,7 +1,7 @@
 // qsamplerDeviceForm.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2012, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007, 2008 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
@@ -60,12 +60,16 @@
 
 	m_ui.DeviceParamTable->setModel(&m_deviceParamModel);
 	m_ui.DeviceParamTable->setItemDelegate(&m_deviceParamDelegate);
+#if QT_VERSION < 0x050000
 	m_ui.DeviceParamTable->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
+#endif
 	m_ui.DeviceParamTable->verticalHeader()->hide();
 
 	m_ui.DevicePortParamTable->setModel(&m_devicePortParamModel);
 	m_ui.DevicePortParamTable->setItemDelegate(&m_devicePortParamDelegate);
+#if QT_VERSION < 0x050000
 	m_ui.DevicePortParamTable->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
+#endif
 	m_ui.DevicePortParamTable->verticalHeader()->hide();
 
 	// Initial contents.
@@ -453,10 +457,10 @@
 		QPixmap pixmap;
 		switch (device.deviceType()) {
 		case Device::Audio:
-			pixmap = QPixmap(":/icons/audio2.png");
+			pixmap = QPixmap(":/images/audio2.png");
 			break;
 		case Device::Midi:
-			pixmap = QPixmap(":/icons/midi2.png");
+			pixmap = QPixmap(":/images/midi2.png");
 			break;
 		case Device::None:
 			break;
@@ -614,16 +618,16 @@
 	bool bClient = (pMainForm->client() != NULL);
 	bool bEnabled = (pItem != NULL);
 	pAction = menu.addAction(
-		QIcon(":/icons/deviceCreate.png"),
+		QIcon(":/images/deviceCreate.png"),
 		tr("&Create device"), this, SLOT(createDevice()));
 	pAction->setEnabled(bEnabled || (bClient && m_bNewDevice));
 	pAction = menu.addAction(
-		QIcon(":/icons/deviceDelete.png"),
+		QIcon(":/images/deviceDelete.png"),
 		tr("&Delete device"), this, SLOT(deleteDevice()));
 	pAction->setEnabled(bEnabled && !m_bNewDevice);
 	menu.addSeparator();
 	pAction = menu.addAction(
-		QIcon(":/icons/formRefresh.png"),
+		QIcon(":/images/formRefresh.png"),
 		tr("&Refresh"), this, SLOT(refreshDevices()));
 	pAction->setEnabled(bClient);