diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/EditorLib.pro
--- a/src/EditorLib/EditorLib.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/EditorLib.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -36,3 +36,9 @@
 win32 {
 	system(xcopy /y *.h ..\..\include\EditorLib\)
 }
+
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/HighLighter.h
--- a/src/EditorLib/HighLighter.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/HighLighter.h	Wed Apr 16 10:17:28 2008 -0400
@@ -26,10 +26,10 @@
 #ifndef HIGHLIGHTER_H
 #define HIGHLIGHTER_H
 
-#include <Qt/qsyntaxhighlighter.h>
-#include <Qt/qhash.h>
-#include <Qt/qtextformat.h>
-#include <Qt/qstringlist.h>
+#include <QtGui/QSyntaxHighlighter>
+#include <QtCore/QHash>
+#include <QtGui/QTextFormat>
+#include <QtCore/QStringList>
 
 class QTextDocument;
 
diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/LuaFunctions.cpp
--- a/src/EditorLib/LuaFunctions.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/LuaFunctions.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -29,7 +29,7 @@
 	#include "Lua/lauxlib.h"
 }
 
-#include <Qt/qfile.h>
+#include <QtCore/QFile>
 
 namespace Lua
 {
diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/LuaFunctions.h
--- a/src/EditorLib/LuaFunctions.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/LuaFunctions.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 
 struct lua_State;
 
-#include <Qt/qstringlist.h>
+#include <QtCore/QStringList>
 
 namespace Lua
 {
diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/TextEdit.cpp
--- a/src/EditorLib/TextEdit.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/TextEdit.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,18 +26,18 @@
 #include "TextEdit.h"
 #include "HighLighter.h"
 
-#include <Qt/qcompleter.h>
-#include <Qt/qapplication.h>
-#include <Qt/qdir.h>
-#include <Qt/qsettings.h>
-#include <Qt/qevent.h>
-#include <Qt/qstringlistmodel.h>
-#include <Qt/qabstractitemview.h>
-#include <Qt/qscrollbar.h>
-#include <Qt/qmenu.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qshortcut.h>
+#include <QtGui/QCompleter>
+#include <QtGui/QApplication>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QStringListModel>
+#include <QtGui/QAbstractItemView>
+#include <QtGui/QScrollBar>
+#include <QtGui/QMenu>
+#include <QtGui/QFileDialog>
+#include <QtCore/QTextStream>
+#include <QtGui/QShortcut>
 
 TextEdit::TextEdit(QWidget* parent /*= 0*/) : QTextEdit(parent), m_fontSize(10)
 {	
diff -r 3727e992ba86 -r 97e055f9873b src/EditorLib/TextEdit.h
--- a/src/EditorLib/TextEdit.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/EditorLib/TextEdit.h	Wed Apr 16 10:17:28 2008 -0400
@@ -26,7 +26,7 @@
 #ifndef TEXTEDIT_H_
 #define TEXTEDIT_H_
 
-#include <Qt/qtextedit.h>
+#include <QtGui/QTextEdit>
 
 class HighLighter;
 class QShortcut;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/AttachmentPlugIn.h
--- a/src/HordeSceneEditor/AttachmentPlugIn.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/AttachmentPlugIn.h	Wed Apr 16 10:17:28 2008 -0400
@@ -28,9 +28,8 @@
 #ifndef ATTACHMENTPLUGIN_H_
 #define ATTACHMENTPLUGIN_H_
 
-#include <Qt/qobject.h>
-#include <Qt/qdom.h>
-#include <Qt/qplugin.h>
+#include <QtCore/QObject>
+#include <QtXml/qdom.h>
 
 struct lua_State;
 class SceneFile;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/AttachmentWidget.cpp
--- a/src/HordeSceneEditor/AttachmentWidget.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/AttachmentWidget.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #include "AttachmentPlugIn.h"
 #include <QXmlTree/QXmlTreeNode.h>
 #include "QSceneNode.h"
-#include <Qt/qmessagebox.h>
+#include <QtGui/QMessageBox>
 
 AttachmentWidget::AttachmentWidget(QWidget* parent /*= 0*/, Qt::WFlags flags /*= 0*/) : QWidget(parent, flags), 
 m_currentAttachmentWidget(0), m_currentPlugIn(0), m_currentNode(0)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/CameraNodePage.cpp
--- a/src/HordeSceneEditor/CameraNodePage.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/CameraNodePage.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -122,4 +122,4 @@
 
 void CameraNodePage::importCamera()
 {
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/CameraNodePage.h
--- a/src/HordeSceneEditor/CameraNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/CameraNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,8 +24,8 @@
 #define CAMERANODEPAGE_H_
 
 #include "ui_CameraNodePage.h"
-#include <Qt/qwizard.h>
-#include <Qt/qdom.h>
+#include <QtGui/QWizard>
+#include <QtXml/qdom.h>
 
 /**
  * Wizard Page for creating a QCameraNode
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ColladaImporter.cpp
--- a/src/HordeSceneEditor/ColladaImporter.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ColladaImporter.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -23,15 +23,15 @@
 #include "ColladaImporter.h"
 
 #include "OverwriteFilesDialog.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qdom.h>
-#include <Qt/qprocess.h>
-#include <Qt/qfilesystemwatcher.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qdir.h>
-#include <Qt/qsettings.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qfileinfo.h>
+#include <QtXml/qdom.h>
+#include <QtCore/QProcess>
+#include <QtCore/QFileSystemWatcher>
+#include <QtGui/QMessageBox>
+#include <QtCore/QDir>
+#include <QtGui/QFileDialog>
+#include <QtCore/QFileInfo>
 
 ColladaImporter::ColladaImporter(QWidget* parent /*= 0*/, Qt::WFlags flags /*= 0*/) : QDialog(parent, flags)
 {
@@ -46,7 +46,7 @@
 
 ColladaImporter::~ColladaImporter()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("ColladaImporter");
 	settings.setValue("defaultShader", m_defaultShader->currentText());	
 	settings.setValue("noOptimizeGeometry", m_noOptimizeGeometry->isChecked());
@@ -62,7 +62,7 @@
 	m_shaderDir = shaderDir;
 	m_shaderDirWatcher->addPath(m_shaderDir);
 	shaderDirModified(m_shaderDir);
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("ColladaImporter");
 	m_defaultShader->setCurrentIndex(m_defaultShader->findText(settings.value("defaultShader", "skinning.shader.xml").toString()));	
 	m_noOptimizeGeometry->setChecked(settings.value("noOptimizeGeometry", false).toBool());
@@ -83,7 +83,7 @@
 
 bool ColladaImporter::setColladaFile()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("ColladaImporter");
 	QString file = QFileDialog::getOpenFileName(this, tr("Select collada file"), settings.value("LastDaeDir").toString(), tr("Collada files (*.collada *.dae);;All files (*.*)"));
 	if (file.isEmpty())
@@ -97,7 +97,7 @@
 void ColladaImporter::importFile()
 {
 	// Collada to Horde Converter executable
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("ColladaImporter");
 	QFileInfo converter(settings.value("Converter", QApplication::applicationDirPath()+QDir::separator()+"ColladaConv.exe").toString());	
 	if (!converter.exists())
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/CustomTypes.h
--- a/src/HordeSceneEditor/CustomTypes.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/CustomTypes.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef CUSTOMTYPES_H_
 #define CUSTOMTYPES_H_
 
-#include <Qt/qvariant.h>
+#include <QtCore/QVariant>
 #include <math.h>
 
 class Property;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/EffectComboBox.cpp
--- a/src/HordeSceneEditor/EffectComboBox.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/EffectComboBox.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 
 #include "EffectComboBox.h"
 
-#include <Qt/qdir.h>
+#include <QtCore/QDir>
 #include "HordeFileDialog.h"
 
 EffectComboBox::EffectComboBox(QWidget* parent /*= 0*/) : QComboBox(parent)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/EffectComboBox.h
--- a/src/HordeSceneEditor/EffectComboBox.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/EffectComboBox.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef EFFECTCOMBOBOX_H_
 #define EFFECTCOMBOBOX_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/EmitterNodePage.h
--- a/src/HordeSceneEditor/EmitterNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/EmitterNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 #ifndef EMITTERNODEPAGE_H_
 #define EMITTERNODEPAGE_H_
 
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 #include "ui_EmitterNodePage.h"
 /**
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ExtraTreeModel.cpp
--- a/src/HordeSceneEditor/ExtraTreeModel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ExtraTreeModel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -24,10 +24,10 @@
 #include "QSceneNode.h"
 #include "QExtrasNode.h"
 
-#include <Qt/qstringlist.h>
-#include <Qt/qtreeview.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qundostack.h>
+#include <QtCore/QStringList>
+#include <QtGui/QTreeView>
+#include <QtGui/QMessageBox>
+#include <QtGui/QUndoStack>
 
 ExtraTreeModel::ExtraTreeModel(const QDomElement &node, QTreeView* parent) : XmlTreeModel()
 {			
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ExtraTreeView.cpp
--- a/src/HordeSceneEditor/ExtraTreeView.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ExtraTreeView.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,15 +27,16 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qapplication.h>
-#include <Qt/qclipboard.h>
-#include <Qt/qmimedata.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qevent.h>
-#include <Qt/qaction.h>
-#include <Qt/qmenu.h>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QMimeData>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
+#include <QtCore/QEvent>
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QContextMenuEvent>
 
 //class RemoveExtraUndoCommand : public QUndoCommand
 //{
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ExtraTreeView.h
--- a/src/HordeSceneEditor/ExtraTreeView.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ExtraTreeView.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,8 +23,8 @@
 #ifndef EXTRATREEVIEW_H_
 #define EXTRATREEVIEW_H_
 
-#include <Qt/qtreeview.h>
-#include <Qt/qdom.h>
+#include <QtGui/QTreeView>
+#include <QtXml/qdom.h>
 class QAction;
 class QXmlTreeNode;
 class SceneFile;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/GLWidget.cpp
--- a/src/HordeSceneEditor/GLWidget.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/GLWidget.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,16 +26,16 @@
 #include "QSceneNode.h"
 #include "CustomTypes.h"
 #include "QOneTimeDialog.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qlistwidget.h>
-#include <Qt/qdir.h>
-#include <Qt/qevent.h>
-#include <Qt/qdatetime.h>
-#include <Qt/qlabel.h>
-#include <Qt/qtimer.h>
-#include <Qt/qapplication.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qsettings.h>
+#include <QtGui/QListWidget>
+#include <QtCore/QDir>
+#include <QtCore/QEvent>
+#include <QtCore/QDateTime>
+#include <QtGui/QLabel>
+#include <QtCore/QTimer>
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
@@ -47,7 +47,7 @@
 #define GIZMO 1
 
 GLWidget::GLWidget(QLabel* fpsLabel, QWidget* parent, Qt::WFlags flags) : QGLWidget(parent, 0, flags), 
-m_fpsLabel(fpsLabel), m_transformationMode(0), m_collisionCheck(false), m_navSpeed(10), m_fps(30.0), m_fullScreen(0), m_shared(false),
+m_fpsLabel(fpsLabel), m_transformationMode(0), m_collisionCheck(false), m_navSpeed(5), m_fps(30.0), m_fullScreen(0), m_shared(false),
 m_forward(false), m_backward(false), m_left(false), m_right(false), m_up(false), m_down(false),
 m_shiftPressed(false), m_controlPressed(false), m_limitToAxis(0), m_axisVpX(1), m_axisVpY(1),
 m_gizmoSelection(0), /*m_transScale(1.0f), */m_debugInfo(0), m_gridScale(10),
@@ -104,7 +104,7 @@
 
 void GLWidget::loadButtonConfig()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("General");
 	m_cameraMoveButton = settings.value("CameraMoveButton", Qt::LeftButton).toInt();
 	m_selectButton = settings.value("SelectButton", Qt::RightButton).toInt();
@@ -515,10 +515,10 @@
 	// Camera Move Button pressed?
 	if (event->button() == m_cameraMoveButton)// Do Camera movement
 	{
-		// Center Cursor for relative movement measurments
-		QCursor::setPos(mapToGlobal(frameGeometry().center()));	
 		// Change Cursor Shape
 		setCursor(Qt::SizeAllCursor);
+		// Trigger camera navigation reset
+		m_navMode = -1;
 	}
 	// Selection Button pressed?
 	else if (event->button() == m_selectButton)
@@ -581,27 +581,22 @@
 
 void GLWidget::mouseMoveEvent(QMouseEvent* event)
 {	
-	static bool ignoreEvents = false;
-	if (ignoreEvents)
-	{
-		event->accept();
-		return;
-	}
-
-	// jump back to screen center if we want to transform the camera
 	if (m_transformationMode == None && event->buttons() & m_cameraMoveButton)
 	{
-		QPoint centerPos(mapToGlobal(frameGeometry().center()));
-		float diffX = event->globalX() - centerPos.x();
-		float diffY = event->globalY() - centerPos.y();		
-		ignoreEvents = true;	
-		QCursor::setPos(centerPos);	
-		QApplication::processEvents();
-		ignoreEvents = false;
-		if (m_controlPressed) // Strafe
-			cameraNavigation(diffX * (m_navSpeed / 100), diffY * (m_navSpeed / 100), 0, 0, 0);
+		bool controlPressed = (event->modifiers() & Qt::ControlModifier) | (event->buttons() & m_selectButton);
+		QPoint globalPos = event->globalPos();
+		if (m_navMode != controlPressed)
+		{
+			cameraNavigationStart();
+			m_navOrigin = globalPos;
+			m_navMode = controlPressed;
+		}
+		float diffX = globalPos.x() - m_navOrigin.x();
+		float diffY = globalPos.y() - m_navOrigin.y();
+		if (controlPressed) // Strafe
+			cameraNavigationUpdate(diffX * (m_navSpeed / 300), diffY * (m_navSpeed / 300), 0, 0, 0);
 		else // Rotate Camera
-			cameraNavigation(0, 0, 0, diffX * (m_navSpeed / 100), diffY * (m_navSpeed / 100));
+			cameraNavigationUpdate(0, 0, 0, diffX * (m_navSpeed / 50), diffY * (m_navSpeed / 50));
 	}
 	// Move object
 	else if (m_transformationMode == MoveObject)
@@ -640,37 +635,49 @@
 	emit fullscreenActive(false);
 }
 
+void GLWidget::cameraNavigationStart()
+{
+	unsigned int cameraID = m_activeCameraID;
+	const float* transMat = 0;
+	if ( Horde3D::getNodeTransformMatrices(cameraID, &transMat, 0) )
+	{
+		memcpy(m_navTransMat, transMat, sizeof(m_navTransMat));
+		Horde3D::getNodeTransform(cameraID, 0,0,0, &m_navRx, &m_navRy, 0,0,0,0);
+	}
+}
+
+
+void GLWidget::cameraNavigationUpdate(float x, float y, float z, float rx, float ry)
+{
+	unsigned int cameraID = m_activeCameraID;
+	const float* transMat = 0;
+	if ( !Horde3D::getNodeTransformMatrices(cameraID, &transMat, 0) ) return;
+	memcpy(const_cast<float*>(transMat), m_navTransMat, sizeof(m_navTransMat));
+
+	float newx, newy, newz;
+	newx = m_navTransMat[0] * x  +  m_navTransMat[4] * (-y) + m_navTransMat[ 8] * z + m_navTransMat[12];
+	newy = m_navTransMat[1] * x  +  m_navTransMat[5] * (-y) + m_navTransMat[ 9] * z + m_navTransMat[13];
+	newz = m_navTransMat[2] * x  +  m_navTransMat[6] * (-y) + m_navTransMat[10] * z + m_navTransMat[14];
+	//int collision = 0;
+	if (!m_collisionCheck || (/*collision = */Horde3D::castRay(RootNode, m_navTransMat[12], m_navTransMat[13], m_navTransMat[14], newx - m_navTransMat[12], newy - m_navTransMat[13], newz - m_navTransMat[14])) == 0)
+	{
+		const_cast<float*>(transMat)[12] = newx;
+		const_cast<float*>(transMat)[13] = newy;
+		const_cast<float*>(transMat)[14] = newz;
+		Horde3D::setNodeTransformMatrix(cameraID, transMat);
+	}
+	float t_px, t_py, t_pz;
+	Horde3D::getNodeTransform(cameraID, &t_px, &t_py, &t_pz, 0,0,0, 0,0,0);		
+	Horde3D::setNodeTransform(cameraID, t_px, t_py, t_pz, qMax(qMin(m_navRx - ry, 87.0f), -87.0f), m_navRy - rx, 0, 1.0f, 1.0f, 1.0f);
+}
+
+
 void GLWidget::cameraNavigation(float x, float y, float z, float rx, float ry)
 {
-	unsigned int cameraID = m_activeCameraID;
-	if (x != 0.0f || y != 0.0f || z!=0.0f)
-	{
-		const float* transMat = 0;
-		if ( !Horde3D::getNodeTransformMatrices(cameraID, &transMat, 0) ) return;			
-
-		float newx, newy, newz;
-		newx = transMat[0] * x  +  transMat[4] * (-y) + transMat[8] * z + transMat[12];
-		newy = transMat[1] * x  +  transMat[5] * (-y) + transMat[9] * z + transMat[13];
-		newz = transMat[2] * x  +  transMat[6] * (-y) + transMat[10] * z + transMat[14];
-		//int collision = 0;
-		if (!m_collisionCheck || (/*collision = */Horde3D::castRay(RootNode, transMat[12], transMat[13], transMat[14], newx - transMat[12], newy - transMat[13], newz - transMat[14])) == 0)
-		{
-			const_cast<float*>(transMat)[12] = newx;
-			const_cast<float*>(transMat)[13] = newy;
-			const_cast<float*>(transMat)[14] = newz;
-			Horde3D::setNodeTransformMatrix(cameraID, transMat);
-		}
-		//updateTransScale();
-		//else
-		//	qDebug("Collision %s", Horde3D::getNodeName(collision));
-	}
-	if (rx != 0.0f || ry != 0.0f)
-	{
-		// TODO user quaternions
-		float t_px, t_py, t_pz, t_rx, t_ry ,t_rz;
-		Horde3D::getNodeTransform(cameraID, &t_px, &t_py, &t_pz, &t_rx, &t_ry, &t_rz, 0,0,0);		
-		Horde3D::setNodeTransform(cameraID, t_px, t_py, t_pz, qMax(qMin(t_rx - ry, 87.0f), -87.0f), t_ry - rx, 0, 1.0f, 1.0f, 1.0f);
-	}	
+	cameraNavigationStart();
+	cameraNavigationUpdate(x, y, z, rx, ry);
+	// Trigger camera navigation reset
+	m_navMode = -1;
 }
 
 void GLWidget::translateObject(int x, int y)
@@ -1260,7 +1267,7 @@
 	Horde3D::getNodeTransform(m_currentNode->hordeId(), &x, &y, &z, &rx, &ry, &rz, &sx, &sy, &sz);
 	if((QVec3f(x, y, z) - pos).length() > 0.001f || (QVec3f(rx, ry, rz) - rot).length() > 0.001f || (QVec3f(sx, sy, sz) - scale).length() > 0.001f )
 	{
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+		QHordeSceneEditorSettings settings(this);
 		settings.beginGroup("ConfirmDialogs");
 		int syncMode = settings.value("TransformationMismatchMode", 0).toInt();
 		if (syncMode == 0)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/GLWidget.h
--- a/src/HordeSceneEditor/GLWidget.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/GLWidget.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef GLWIDGET_H_
 #define GLWIDGET_H_
 
-#include <Qt/qgl.h>
+#include <QtOpenGL/QtOpenGL>
 
 class QLabel;
 class QTimer;
@@ -207,7 +207,18 @@
 
 private:
 	/**
-	 * Changes the transformation of the currently set camera 
+	 * Changes the transformation of the currently set camera relative to the
+	 * transformation effective at the begining of the camera move
+	 * @param x translation in x
+	 * @param y translation in y
+	 * @param z translation in z
+	 * @param rx rotation about x
+	 * @param ry rotation about y
+	 */
+	void cameraNavigationUpdate(float x, float y, float z, float rx, float ry);
+
+	/**
+	 * Changes the transformation of the currently set camera
 	 * @param x translation in x
 	 * @param y translation in y
 	 * @param z translation in z
@@ -215,6 +226,11 @@
 	 * @param ry rotation about y
 	 */
 	void cameraNavigation(float x, float y, float z, float rx, float ry);
+
+	/**
+	 * Remembers the transformation of the currently set camera
+	 */
+	void cameraNavigationStart();
 
 	/**
 	 * Creates a translation for the currently selected object based on the axis limitations set
@@ -252,6 +268,10 @@
 	bool			m_collisionCheck;
 
 	float			m_navSpeed;
+	int				m_navMode;
+	QPoint			m_navOrigin;
+	float			m_navTransMat[16], m_navRx, m_navRy;
+
 	float			m_fps;
 	GLWidget*		m_fullScreen;
 	const bool		m_shared;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/GroupNodePage.h
--- a/src/HordeSceneEditor/GroupNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/GroupNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define GROUPNODEPAGE_H_
 
 #include "ui_GroupNodePage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 /**
  * Wizard Page for creating a QGroupNode
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/HordeFileDialog.cpp
--- a/src/HordeSceneEditor/HordeFileDialog.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/HordeFileDialog.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,15 +26,15 @@
 #include "Importer.h"
 #include "SceneFile.h"
 #include "ColladaImporter.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qsettings.h>
-#include <Qt/qdir.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qlayout.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qfile.h>
-#include <Qt/qimagereader.h>
+#include <QtCore/QDir>
+#include <QtGui/QFileDialog>
+#include <QtGui/QLayout>
+#include <QtCore/QTextStream>
+#include <QtGui/QMessageBox>
+#include <QtCore/QFile>
+#include <QtGui/QImageReader>
 
 #include <Horde3D/Horde3DUtils.h>
 #include <math.h>
@@ -276,7 +276,7 @@
 		m_glFrame->layout()->addWidget(m_glWidget);
 		m_glWidget->setNavigationSpeed(10.0);
 	}
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.scene.xml";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -287,7 +287,7 @@
 
 void HordeFileDialog::initTextureView(ResourceTypes::List type)
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.jpg;*.png;*.tga;*.bmp;*.psd";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -298,7 +298,7 @@
 
 void HordeFileDialog::initShaderView()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.shader.xml";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -309,7 +309,7 @@
 
 void HordeFileDialog::initMaterialView()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.material.xml";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -320,7 +320,7 @@
 
 void HordeFileDialog::initEffectView()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.effect.xml";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -331,7 +331,7 @@
 
 void HordeFileDialog::initPipelineView()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	m_currentFilter = "*.pipeline.xml";
 	if ( HordeSceneEditor::instance()->glContext() )
@@ -366,7 +366,7 @@
 void HordeFileDialog::itemChanged(QListWidgetItem* current, QListWidgetItem* /*previous*/)
 {
 	setCursor(Qt::BusyCursor);
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	if (current)
 	{
@@ -405,7 +405,7 @@
 	ColladaImporter importDlg;
 	if (!importDlg.setColladaFile())
 		return;
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Repository");
 	importDlg.initImportPath(
 		settings.value("sceneGraphDir", DefaultModelsRepoPath.absolutePath()).toString(),
@@ -446,7 +446,7 @@
 {
 	if (repoFile) // set repository pathes
 	{
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+		QHordeSceneEditorSettings settings(this);
 		settings.beginGroup("Repository");
 		Horde3DUtils::setResourcePath(ResourceTypes::SceneGraph, qPrintable(settings.value("sceneGraphDir", DefaultModelsRepoPath.absolutePath()).toString()));
 		Horde3DUtils::setResourcePath(ResourceTypes::Geometry, qPrintable(settings.value("geometryDir", DefaultModelsRepoPath.absolutePath()).toString()));
@@ -649,4 +649,4 @@
 		return dlg.fileName();
 	else
 		return QString();	
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/HordeFileDialog.h
--- a/src/HordeSceneEditor/HordeFileDialog.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/HordeFileDialog.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,9 +25,9 @@
 
 #include "ui_HordeFileDialog.h"
 
-#include <Qt/qfileinfo.h>
-#include <Qt/qdom.h>
-#include <Qt/qdir.h>
+#include <QtCore/QFileInfo>
+#include <QtXml/qdom.h>
+#include <QtCore/QDir>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/HordeSceneEditor.cpp
--- a/src/HordeSceneEditor/HordeSceneEditor.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/HordeSceneEditor.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -34,23 +34,23 @@
 #include "ToolPlugIn.h"
 #include "FindDialog.h"
 #include "QOneTimeDialog.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qsplashscreen.h>
-#include <Qt/qdatetime.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qtimer.h>
-#include <Qt/qsettings.h>
-#include <Qt/qevent.h>
-#include <Qt/qfilesystemwatcher.h>
-#include <Qt/qundogroup.h>
-#include <Qt/qundostack.h>
-#include <Qt/qgl.h>
-#include <Qt/qdesktopservices.h>
-#include <Qt/qurl.h>
-#include <Qt/qpluginloader.h>
-#include <Qt/qlibrary.h>
+#include <QtGui/QSplashScreen>
+#include <QtCore/QDateTime>
+#include <QtGui/QMessageBox>
+#include <QtCore/QTextStream>
+#include <QtGui/QFileDialog>
+#include <QtCore/QTimer>
+#include <QtCore/QEvent>
+#include <QtCore/QFileSystemWatcher>
+#include <QtGui/QUndoGroup>
+#include <QtGui/QUndoStack>
+#include <QtOpenGL/QtOpenGL>
+#include <QtGui/QDesktopServices>
+#include <QtCore/QUrl>
+#include <QtCore/QPluginLoader>
+#include <QtCore/QLibrary>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
@@ -168,7 +168,7 @@
 	connect(m_actionPaths, SIGNAL(triggered()), this, SLOT(configureScenePaths()));
 
 	// Tool PlugIn Actions
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("General");
 	QDir pluginsDir(settings.value("ToolsPlugInPath", QApplication::applicationDirPath()+QDir::separator()+"tools").toString());
 	settings.endGroup();	
@@ -278,7 +278,7 @@
 
 HordeSceneEditor::~HordeSceneEditor()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("WindowState");
 	settings.setValue("State", (unsigned int) windowState());
 	settings.endGroup();
@@ -427,7 +427,7 @@
 		Horde3DUtils::loadResourcesFromDisk("");
 		loadScreen.showMessage(tr("Updating Recent Files"), Qt::AlignLeft, Qt::white);
 		// Update recent files
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+		QHordeSceneEditorSettings settings(this);
 		settings.beginGroup("RecentFiles");
 		QStringList files = settings.value("RecentFileList").toStringList();
 		files.removeAll(m_sceneFile->absoluteSceneFilePath());
@@ -515,7 +515,7 @@
 		m_materialWidget->closeMaterial();
 	foreach(ToolPlugIn* plugin, m_toolPlugIns)
 			plugin->setSceneFile(0);
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("WindowState");
 	settings.setValue("LuaDialog", m_luaDockWidget->isVisible());
 	settings.setValue("LogWidgetDock", m_logWidgetDock->isVisible());
@@ -601,7 +601,7 @@
 void HordeSceneEditor::updateMenus()
 {
 	restoreWindowSettings();
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("WindowState");
 	m_nodeWidgetDock->setVisible(m_sceneFile!=0);
 	m_sceneElementDock->setVisible(m_sceneFile!=0);
@@ -652,7 +652,7 @@
 
 void HordeSceneEditor::updateRecentFileActions()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("RecentFiles");
 	QStringList files = settings.value("RecentFileList").toStringList();
 	settings.endGroup();
@@ -708,7 +708,7 @@
 	SettingsDialog dlg(this);
 	if (dlg.exec() == QDialog::Accepted)
 	{
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+		QHordeSceneEditorSettings settings;
 		settings.beginGroup("General");
 		int limit = settings.value("UndoStackSize").toInt();
 		QList<QUndoStack*> stacks = m_undoGroup->stacks();
@@ -726,7 +726,7 @@
 {
 	if (m_sceneFile->absoluteSceneFilePath() == path)
 	{		
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+		QHordeSceneEditorSettings settings(this);
 		settings.beginGroup("ConfirmDialogs");
 		int reloadMode = settings.value("ReloadMode", 0).toInt();
 		if (reloadMode != 0)
@@ -980,7 +980,7 @@
 void HordeSceneEditor::restoreWindowSettings()
 {
 	// restore window settings
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("WindowState");
 	restoreState(settings.value("DockWidgets").toByteArray());
 	m_actionToggleDockwindowVisibility->blockSignals(true);
@@ -1004,7 +1004,7 @@
 void HordeSceneEditor::saveWindowSettings()
 {
 	// save window settings
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("WindowState");
 	settings.setValue("DockWidgets", saveState());	
 	settings.setValue("DockWidgetToggling", m_actionToggleDockwindowVisibility->isChecked());
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/HordeSceneEditor.h
--- a/src/HordeSceneEditor/HordeSceneEditor.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/HordeSceneEditor.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,9 +25,9 @@
 
 #include "ui_HordeSceneEditor.h"
 
-#include <Qt/qdir.h>
-#include <Qt/qdom.h>
-#include <Qt/qclipboard.h>
+#include <QtCore/QDir>
+#include <QtXml/qdom.h>
+#include <QtGui/QClipboard>
 
 class GLWidget;
 class SceneFile;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/HordeSceneEditor.pro
--- a/src/HordeSceneEditor/HordeSceneEditor.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/HordeSceneEditor.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -28,6 +28,7 @@
 		QUniform.cpp \
 		Vec3fProperty.cpp \
 		ViewToolBar.cpp \
+		QHordeSceneEditorSettings.cpp \
 		QCameraNode.cpp \
 		QGroupNode.cpp \
 		QJointNode.cpp \
@@ -99,6 +100,7 @@
 		QUniform.h \
 		Vec3fProperty.h \
 		ViewToolBar.h \
+		QHordeSceneEditorSettings.h \
 		QCameraNode.h \
 		QGroupNode.h \
 		QJointNode.h \
@@ -169,14 +171,22 @@
 
 DESTDIR = ../../bin
 
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+	LIBS += -llua
+	LIBS += -framework Horde3D
+}
+
 CONFIG(debug, debug|release) {
 	LIBS += -L../../lib
 	win32 {
 		LIBS += -lHorde3D_vc8
 		LIBS += -lLuad
 	}
-	unix {
-    	LIBS += -L../../bin
+	unix:!macx {
+    		LIBS += -L../../bin
 		LIBS += -lHorde3D
 		LIBS += -lHorde3DUtils
 		LIBS += -lHorde3DTerrain
@@ -199,8 +209,8 @@
 		LIBS += -lHorde3D_vc8
 		LIBS += -lLua
 	}
-	unix {
-    	LIBS += -L../../bin
+	unix:!macx {
+    		LIBS += -L../../bin
 		LIBS += -lHorde3D
 		LIBS += -lHorde3DUtils
 		LIBS += -lHorde3DTerrain
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ImgLabel.cpp
--- a/src/HordeSceneEditor/ImgLabel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ImgLabel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -21,7 +21,7 @@
 // ****************************************************************************************
 #include "ImgLabel.h"
 
-#include <Qt/qevent.h>
+#include <QtGui/QMouseEvent>
 
 ImgLabel::ImgLabel(QWidget* parent /*= 0*/) : QLabel(parent)
 {
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ImgLabel.h
--- a/src/HordeSceneEditor/ImgLabel.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ImgLabel.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef IMGLABEL_H_
 #define IMGLABEL_H_
 
-#include <Qt/qlabel.h>
+#include <QtGui/QLabel>
 
 class ImgLabel : public QLabel
 {
@@ -42,4 +42,4 @@
 	void wheelEvent(QWheelEvent* event);
 
 };
-#endif
\ No newline at end of file
+#endif
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/Importer.cpp
--- a/src/HordeSceneEditor/Importer.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/Importer.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,17 +22,16 @@
 
 #include "Importer.h"
 #include "OverwriteFilesDialog.h"
+#include "QHordeSceneEditorSettings.h"
 
-
-#include <Qt/qdom.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qsettings.h>
+#include <QtXml/qdom.h>
+#include <QtGui/QMessageBox>
 
 #include <Horde3D/Horde3DUtils.h>
 
 Importer::Importer()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("Repository");
 	m_sourceResourcePaths[ResourceTypes::SceneGraph] = settings.value("sceneGraphDir", QApplication::applicationDirPath()+QDir::separator()+"Repository"+QDir::separator()+"models").toString();
 	m_sourceResourcePaths[ResourceTypes::Geometry]   = settings.value("sceneGraphDir", QApplication::applicationDirPath()+QDir::separator()+"Repository"+QDir::separator()+"models").toString();
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/Importer.h
--- a/src/HordeSceneEditor/Importer.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/Importer.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,10 +23,10 @@
 #ifndef IMPORTER_H_
 #define IMPORTER_H_
 
-#include <Qt/qfileinfo.h>
-#include <Qt/qdir.h>
-#include <Qt/qlist.h>
-#include <Qt/qvariant.h>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
 
 #include <Horde3D/Horde3D.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/LightNodePage.h
--- a/src/HordeSceneEditor/LightNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/LightNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define LIGHTNODEPAGE_H_
 
 #include "ui_LightNodePage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 /**
  * Wizard Page for creating a QLightNode
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/LuaController.cpp
--- a/src/HordeSceneEditor/LuaController.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/LuaController.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -21,6 +21,7 @@
 // ****************************************************************************************
 
 #include "LuaController.h"
+#include "QHordeSceneEditorSettings.h"
 
 extern "C"
 {
@@ -30,9 +31,8 @@
 }
 #include <EditorLib/LuaFunctions.h>
 
-#include <Qt/qsettings.h>
-#include <Qt/qdir.h>
-#include <Qt/qtimer.h>
+#include <QtCore/QDir>
+#include <QtCore/QTimer>
 
 #include "QStdOutListener.h"
 #include "SceneFile.h"
@@ -49,7 +49,7 @@
 	connect(m_executeButton, SIGNAL(clicked()), this, SLOT(runScript()));
 	connect(m_runLoop, SIGNAL(toggled(bool)), this, SLOT(toggleLoopExecution(bool)));
 	connect(m_execTimer, SIGNAL(timeout()), this, SLOT(runScript()));
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Lua");
 	m_scriptEditor->setPlainText(settings.value("Editor", "").toString());
 	m_clearOnExecute->setChecked(settings.value("ClearOnExecute").toBool());
@@ -69,7 +69,7 @@
 #endif
 	if (m_L)
 		lua_close( m_L );	
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, this);
+	QHordeSceneEditorSettings settings(this);
 	settings.beginGroup("Lua");
 	settings.setValue("Editor", m_scriptEditor->toPlainText());
 	settings.setValue("ClearOnExecute", m_clearOnExecute->isChecked());
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/MaterialComboBox.cpp
--- a/src/HordeSceneEditor/MaterialComboBox.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/MaterialComboBox.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 
 #include "MaterialComboBox.h"
 
-#include <Qt/qdir.h>
+#include <QtCore/QDir>
 #include "HordeFileDialog.h"
 
 MaterialComboBox::MaterialComboBox(QWidget* parent /*= 0*/) : QComboBox(parent)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/MaterialComboBox.h
--- a/src/HordeSceneEditor/MaterialComboBox.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/MaterialComboBox.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef MATERIALCOMBOBOX_H_
 #define MATERIALCOMBOBOX_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/MaterialWidget.cpp
--- a/src/HordeSceneEditor/MaterialWidget.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/MaterialWidget.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -23,20 +23,20 @@
 #include "MaterialWidget.h"
 #include "HordeFileDialog.h"
 #include "QTexUnit.h"
-#include "QUniform.h"
+#include "QUniform.h"
+#include "QHordeSceneEditorSettings.h"
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
 
-#include <Qt/qfile.h>
-#include <Qt/qinputdialog.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qdom.h>
-#include <Qt/qprocess.h>
-#include <Qt/qsettings.h>
-#include <Qt/qfilesystemwatcher.h>
+#include <QtCore/QFile>
+#include <QtGui/QInputDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QFileDialog>
+#include <QtCore/QTextStream>
+#include <QtXml/qdom.h>
+#include <QtCore/QProcess>
+#include <QtCore/QFileSystemWatcher>
 
 MaterialWidget::MaterialWidget(QWidget* parent /*= 0*/, Qt::WFlags flags /*= 0*/) : QWidget(parent, flags)
 {
@@ -149,7 +149,7 @@
 
 void MaterialWidget::editShader()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("Editors");
 	// TODO either create a shader editor or add a file system watcher or something like that
 	QProcess::startDetached(
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/MaterialWidget.h
--- a/src/HordeSceneEditor/MaterialWidget.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/MaterialWidget.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 
 #include "ui_MaterialWidget.h"
 
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
 
 class QFileSystemWatcher;
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/NodeWidget.cpp
--- a/src/HordeSceneEditor/NodeWidget.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/NodeWidget.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #include "QSceneNode.h"
 #include "CustomTypes.h"
 
-#include <Qt/qlayout.h>
+#include <QtGui/QLayout>
 #include <Horde3D/Horde3D.h>
 
 NodeWidget::NodeWidget(QWidget* parent /*= 0*/) : QPropertyEditorWidget(parent), m_currentNode(0)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/OverwriteFilesDialog.cpp
--- a/src/HordeSceneEditor/OverwriteFilesDialog.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/OverwriteFilesDialog.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,11 +22,11 @@
 
 #include "OverwriteFilesDialog.h"
 
-#include <Qt/qfile.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qinputdialog.h>
-#include <Qt/qprogressdialog.h>
-#include <Qt/qpushbutton.h>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
+#include <QtGui/QInputDialog>
+#include <QtGui/QProgressDialog>
+#include <QtGui/QPushButton>
 
 OverwriteFilesDialog::OverwriteFilesDialog(const QList<CopyJob>& filesToOverwrite, QWidget* parent /*= 0*/, Qt::WFlags flags /*= 0*/) : QDialog(parent, flags)
 {
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PathPage.cpp
--- a/src/HordeSceneEditor/PathPage.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PathPage.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,9 +22,9 @@
 
 #include "PathPage.h"
 
-#include <Qt/qsignalmapper.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qmessagebox.h>
+#include <QtCore/QSignalMapper>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
 
 PathPage::PathPage(QWidget* parent /*= 0*/) : QWizardPage(parent)
 {
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PathPage.h
--- a/src/HordeSceneEditor/PathPage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PathPage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define PATHPAGE_H_
 
 #include "ui_PathPage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 class QSignalMapper;
 /**
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PipelineComboBox.cpp
--- a/src/HordeSceneEditor/PipelineComboBox.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PipelineComboBox.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 
 #include "PipelineComboBox.h"
 
-#include <Qt/qdir.h>
+#include <QtCore/QDir>
 #include "HordeFileDialog.h"
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PipelineComboBox.h
--- a/src/HordeSceneEditor/PipelineComboBox.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PipelineComboBox.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef PIPELINECOMBOBOX_H_
 #define PIPELINECOMBOBOX_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PipelineTreeModel.cpp
--- a/src/HordeSceneEditor/PipelineTreeModel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PipelineTreeModel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -23,10 +23,10 @@
 #include "PipelineTreeModel.h"
 #include "QPipelineNode.h"
 
-#include <Qt/qstringlist.h>
-#include <Qt/qtreeview.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qundostack.h>
+#include <QtCore/QStringList>
+#include <QtGui/QTreeView>
+#include <QtGui/QMessageBox>
+#include <QtGui/QUndoStack>
 
 PipelineTreeModel::PipelineTreeModel(unsigned int pipelineID, const QDomElement &node, QTreeView* parent) : QXmlTreeModel()
 {			
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PipelineTreeView.cpp
--- a/src/HordeSceneEditor/PipelineTreeView.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PipelineTreeView.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -28,10 +28,10 @@
 #include "RenderTargetView.h"
 
 
-#include <Qt/qfile.h>
-#include <Qt/qdir.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qmessagebox.h>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QTextStream>
+#include <QtGui/QMessageBox>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
@@ -124,4 +124,4 @@
 	int index = m_renderTargetViews.indexOf(view);
 	if (index != -1)
 		delete m_renderTargetViews.takeAt(index);
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PipelineTreeView.h
--- a/src/HordeSceneEditor/PipelineTreeView.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PipelineTreeView.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef PIPELINETREEVIEW_H_
 #define PIPELINETREEVIEW_H_
 
-#include <Qt/qtreeview.h>
+#include <QtGui/QTreeView>
 
 class QXmlTreeNode;
 class RenderTargetView;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PlugInPage.cpp
--- a/src/HordeSceneEditor/PlugInPage.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PlugInPage.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -21,12 +21,12 @@
 // ****************************************************************************************
 
 #include "PlugInPage.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qpluginloader.h>
-#include <Qt/qsettings.h>
-#include <Qt/qdir.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qlibrary.h>
+#include <QtCore/QPluginLoader>
+#include <QtCore/QDir>
+#include <QtGui/QMessageBox>
+#include <QtCore/QLibrary>
 
 #include "AttachmentPlugIn.h"
 #include "ToolPlugIn.h"
@@ -48,7 +48,7 @@
 
 void PlugInPage::initializePage()
 {
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("General");
 	QDir pluginsDir(settings.value("PlugInPath", QApplication::applicationDirPath()+QDir::separator()+"plugins").toString());
 	settings.endGroup();	
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/PlugInPage.h
--- a/src/HordeSceneEditor/PlugInPage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/PlugInPage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define PLUGINPAGE_H_
 
 #include "ui_PlugInPage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 class PlugInPage : public QWizardPage, protected Ui_PlugInPage
 {
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QCameraNode.cpp
--- a/src/HordeSceneEditor/QCameraNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QCameraNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -28,9 +28,9 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qaction.h>
-#include <Qt/qfile.h>
+#include <QtCore/QTextStream>
+#include <QtGui/QAction>
+#include <QtCore/QFile>
 
 #include <Horde3D/Horde3D.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QEmitterNode.cpp
--- a/src/HordeSceneEditor/QEmitterNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QEmitterNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,10 +26,10 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
-#include <Qt/qdir.h>
-#include <Qt/qfileinfo.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
@@ -271,4 +271,4 @@
 {
 	if (m_hordeID != 0)
 		Horde3D::advanceEmitterTime(m_hordeID, 0.1f);
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QGroupNode.cpp
--- a/src/HordeSceneEditor/QGroupNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QGroupNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -28,7 +28,7 @@
 #include "SceneFile.h"
 
 #include <float.h>
-#include <Qt/qtextstream.h>
+#include <QtCore/QTextStream>
 #include <Horde3D/Horde3D.h>
 
 QGroupNode::QGroupNode(const QDomElement& xmlNode, int row, SceneTreeModel* model, QSceneNode* parentNode) : 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QHordeSceneEditorSettings.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/HordeSceneEditor/QHordeSceneEditorSettings.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -0,0 +1,34 @@
+// ****************************************************************************************
+//
+// Horde3D Scene Editor 
+// --------------------------------------
+// Copyright (C) 2007 Volker Wiendl
+// 
+// This file is part of the Horde3D Scene Editor.
+//
+// The Horde3D Scene Editor 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 version 3 of the License 
+//
+// The Horde3D Scene Editor 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, see <http://www.gnu.org/licenses/>.
+//
+// ****************************************************************************************
+
+#include "QHordeSceneEditorSettings.h"
+#include <QtCore/QDir>
+#include <QtGui/QApplication>
+
+QHordeSceneEditorSettings::QHordeSceneEditorSettings(QObject * parent) :
+#ifdef __APPLE__
+	QSettings("Horde3D.org", "HordeSceneEditor", parent)
+#else
+	QSettings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat, parent)
+#endif
+{
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QHordeSceneEditorSettings.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/HordeSceneEditor/QHordeSceneEditorSettings.h	Wed Apr 16 10:17:28 2008 -0400
@@ -0,0 +1,41 @@
+// ****************************************************************************************
+//
+// Horde3D Scene Editor 
+// --------------------------------------
+// Copyright (C) 2007 Volker Wiendl
+// 
+// This file is part of the Horde3D Scene Editor.
+//
+// The Horde3D Scene Editor 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 version 3 of the License 
+//
+// The Horde3D Scene Editor 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, see <http://www.gnu.org/licenses/>.
+//
+// ****************************************************************************************
+
+#ifndef QHORDESCENEEDITORSETTINGS_H_
+#define QHORDESCENEEDITORSETTINGS_H_
+
+#include <QtCore/QSettings>
+
+/**
+ * x
+ */ 
+class QHordeSceneEditorSettings : public QSettings
+{
+public:
+	QHordeSceneEditorSettings(QObject * parent = 0);
+};
+
+#endif
+
+
+
+
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QJointNode.cpp
--- a/src/HordeSceneEditor/QJointNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QJointNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,7 +27,7 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
+#include <QtCore/QTextStream>
 
 #include <Horde3D/Horde3D.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QLightNode.cpp
--- a/src/HordeSceneEditor/QLightNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QLightNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -32,8 +32,8 @@
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
 
 
 QLightNode::QLightNode(const QDomElement& xmlNode, int row, SceneTreeModel* model, QSceneNode* parentNode) : 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QLightNode.h
--- a/src/HordeSceneEditor/QLightNode.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QLightNode.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define QLIGHTNODE_H_
 
 #include "QSceneNode.h"
-#include <Qt/qcolor.h>
+#include <QtGui/QColor>
 
 /**
  * A light node item for the SceneTreeModel
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QMeshNode.cpp
--- a/src/HordeSceneEditor/QMeshNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QMeshNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,10 +27,10 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
-#include <Qt/qdir.h>
-#include <Qt/qfileinfo.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QModelNode.cpp
--- a/src/HordeSceneEditor/QModelNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QModelNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,10 +27,10 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
-#include <Qt/qdir.h>
-#include <Qt/qfileinfo.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QOneTimeDialog.cpp
--- a/src/HordeSceneEditor/QOneTimeDialog.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QOneTimeDialog.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -60,4 +60,4 @@
 	int result = (int) dlg.m_button;
 
 	return result | ( dlg.m_applyForAll->isChecked() ? ApplyAlways : 0 );
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QPipelineCommandQueueNode.h
--- a/src/HordeSceneEditor/QPipelineCommandQueueNode.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QPipelineCommandQueueNode.h	Wed Apr 16 10:17:28 2008 -0400
@@ -35,4 +35,4 @@
 	QXmlTreeNode* createChild(const QDomElement& childNode, int row);
 
 };
-#endif
\ No newline at end of file
+#endif
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QPipelineNode.h
--- a/src/HordeSceneEditor/QPipelineNode.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QPipelineNode.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #define QPIPELINENODE_H_
 
 #include <QXmlTree/QXmlTreeNode.h>
-#include <Qt/qvariant.h>
+#include <QtCore/QVariant>
 
 class QPipelineNode : public QXmlTreeNode
 {
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QPipelineSetupNode.cpp
--- a/src/HordeSceneEditor/QPipelineSetupNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QPipelineSetupNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -44,4 +44,4 @@
 {
 	// since known nodes only contains RenderTarget, we can assume that the childNode is a RenderTarget node
 	return new QPipelineRenderTargetNode(childNode, row, m_model, this);
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QReferenceNode.cpp
--- a/src/HordeSceneEditor/QReferenceNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QReferenceNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,11 +27,11 @@
 #include "AttachmentPlugIn.h"
 #include "SceneFile.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfileinfo.h>
-#include <Qt/qdir.h>
-#include <Qt/qfile.h>
-#include <Qt/qmessagebox.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QSceneNode.cpp
--- a/src/HordeSceneEditor/QSceneNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QSceneNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -40,7 +40,7 @@
 
 #include <Horde3D/Horde3D.h>
 
-#include <Qt/qapplication.h>
+#include <QtGui/QApplication>
 
 QSceneNode::QSceneNode(const QDomElement& xmlNode, int row, SceneTreeModel* model, QSceneNode* parentNode) : 
 QXmlTreeNode(xmlNode, row, model, parentNode), m_hordeID(0), m_active(true)
@@ -290,4 +290,4 @@
 	newCamTrans.translate(0, 0, qMax(nearPlane * offsetX / rightPlane, nearPlane * offsetY / topPlane));		
 	Horde3D::setNodeTransformMatrix(cameraID, (QMatrix4f(camera).inverted() * newCamTrans).x);	
 
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QSceneNode.h
--- a/src/HordeSceneEditor/QSceneNode.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QSceneNode.h	Wed Apr 16 10:17:28 2008 -0400
@@ -27,7 +27,7 @@
 
 #include "CustomTypes.h"
 
-#include <Qt/qstringlist.h>
+#include <QtCore/QStringList>
 
 class SceneTreeModel;
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QStdOutListener.h
--- a/src/HordeSceneEditor/QStdOutListener.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QStdOutListener.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef QSTDOUTLISTENER_H_
 #define QSTDOUTLISTENER_H_
 
-#include <Qt/qobject.h>
+#include <QtCore/QObject>
 
 #ifdef _WIN32
 #include <windows.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QTerrainNode.cpp
--- a/src/HordeSceneEditor/QTerrainNode.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QTerrainNode.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -29,10 +29,10 @@
 #include "SceneFile.h"
 
 
-#include <Qt/qtextstream.h>
-#include <Qt/qfile.h>
-#include <Qt/qdir.h>
-#include <Qt/qfileinfo.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QTexUnit.h
--- a/src/HordeSceneEditor/QTexUnit.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QTexUnit.h	Wed Apr 16 10:17:28 2008 -0400
@@ -22,8 +22,8 @@
 #ifndef QTEXUNIT_H_
 #define QTEXUNIT_H_
 
-#include <Qt/qobject.h>
-#include <Qt/qdom.h>
+#include <QtCore/QObject>
+#include <QtXml/qdom.h>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/QUniform.h
--- a/src/HordeSceneEditor/QUniform.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/QUniform.h	Wed Apr 16 10:17:28 2008 -0400
@@ -22,8 +22,8 @@
 #ifndef QUNIFORM_H_
 #define QUNIFORM_H_
 
-#include <Qt/qobject.h>
-#include <Qt/qdom.h>
+#include <QtCore/QObject>
+#include <QtXml/qdom.h>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ReferenceNodePage.cpp
--- a/src/HordeSceneEditor/ReferenceNodePage.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ReferenceNodePage.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -24,8 +24,8 @@
 #include "HordeFileDialog.h"
 
 #include <Horde3D/Horde3D.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qdir.h>
+#include <QtGui/QFileDialog>
+#include <QtCore/QDir>
 
 
 ReferenceNodePage::ReferenceNodePage(QWidget* parent /*= 0*/) : QWizardPage(parent)
@@ -58,4 +58,4 @@
 {
 	m_fileName->setText(QDir(Horde3DUtils::getResourcePath(ResourceTypes::SceneGraph)).relativeFilePath(m_fileName->text()));
 	return true;
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ReferenceNodePage.h
--- a/src/HordeSceneEditor/ReferenceNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ReferenceNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define REFERENCENODEPAGE_H_
 
 #include "ui_ReferenceNodePage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 /**
  * Wizard Page for creating a QReferenceNode
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/RenderTargetView.cpp
--- a/src/HordeSceneEditor/RenderTargetView.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/RenderTargetView.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,17 +27,17 @@
 #include "HordeSceneEditor.h"
 #include "GLWidget.h"
 
-#include <Qt/qevent.h>
-#include <Qt/qbitmap.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qimagewriter.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qimage.h>
-#include <Qt/qscrollarea.h>
-#include <Qt/qscrollbar.h>
-#include <Qt/qvector.h>
-#include <Qt/qapplication.h>
-#include <Qt/qclipboard.h>
+#include <QtCore/QEvent>
+#include <QtGui/QBitmap>
+#include <QtGui/QFileDialog>
+#include <QtGui/QImageWriter>
+#include <QtGui/QMessageBox>
+#include <QtGui/QImage>
+#include <QtGui/QScrollArea>
+#include <QtGui/QScrollBar>
+#include <QtCore/QVector>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
 
 #include <Horde3D/Horde3D.h>
 
@@ -313,4 +313,4 @@
 void RenderTargetView::adjustScrollBar(QScrollBar *scrollBar, double factor)
 {
 	scrollBar->setValue(int(factor * scrollBar->value()	+ ((factor - 1) * scrollBar->pageStep()/2)));
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/RenderTargetView.h
--- a/src/HordeSceneEditor/RenderTargetView.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/RenderTargetView.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef RENDERTARGETVIEW_H_
 #define RENDERTARGETVIEW_H_
 
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
 
 #include "ui_RenderTargetView.h"
 
@@ -70,4 +70,4 @@
 	float*			m_imgData;
 	int				m_imgDepth;
 };
-#endif
\ No newline at end of file
+#endif
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneFile.cpp
--- a/src/HordeSceneEditor/SceneFile.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneFile.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -20,16 +20,16 @@
 //
 // ****************************************************************************************
 
-#include "SceneFile.h"
-#include <Qt/qmessagebox.h>
-#include <Qt/qfile.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qdir.h>
-#include <Qt/qsettings.h>
-#include <Qt/qlibrary.h>
-#include <Qt/qpluginloader.h>
-#include <Qt/qapplication.h>
-#include <Qt/qundostack.h>
+#include "SceneFile.h"
+#include "QHordeSceneEditorSettings.h"
+#include <QtGui/QMessageBox>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QDir>
+#include <QtCore/QLibrary>
+#include <QtCore/QPluginLoader>
+#include <QtGui/QApplication>
+#include <QtGui/QUndoStack>
 
 #include <Horde3D/Horde3D.h>
 #include <Horde3D/Horde3DUtils.h>
@@ -69,7 +69,7 @@
 	QString attachmentPlugIn = scene->m_sceneFileXml.documentElement().firstChildElement("AttachmentPlugIn").attribute("name");
 	if (!attachmentPlugIn.isEmpty())
 	{
-		QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+		QHordeSceneEditorSettings settings;
 		settings.beginGroup("General");
 		QDir pluginsDir(settings.value("PlugInPath", QApplication::applicationDirPath()+QDir::separator()+"plugins").toString());
 		settings.endGroup();	
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneFile.h
--- a/src/HordeSceneEditor/SceneFile.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneFile.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,9 +23,9 @@
 #ifndef SCENEFILE_H_
 #define SCENEFILE_H_
 
-#include <Qt/qstring.h>
-#include <Qt/qfileinfo.h>
-#include <Qt/qdom.h>
+#include <QtCore/QString>
+#include <QtCore/QFileInfo>
+#include <QtXml/qdom.h>
 
 class AttachmentPlugIn;
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneFilePage.cpp
--- a/src/HordeSceneEditor/SceneFilePage.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneFilePage.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,11 +22,11 @@
 
 #include "SceneFilePage.h"
 
-#include <Qt/qfiledialog.h>
-#include <Qt/qfileinfo.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qcompleter.h>
-#include <Qt/qdirmodel.h>
+#include <QtGui/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtGui/QMessageBox>
+#include <QtGui/QCompleter>
+#include <QtGui/QDirModel>
 
 SceneFilePage::SceneFilePage(QWidget* parent /*= 0*/) : QWizardPage(parent)
 {
@@ -100,4 +100,4 @@
 	}
 	QDir::setCurrent(m_scenePath->text());	
 	return true;
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneFilePage.h
--- a/src/HordeSceneEditor/SceneFilePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneFilePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define SCENEFILEPAGE_H_
 
 #include "ui_SceneFilePage.h"
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 /**
  * Wizard Page for creating a new SceneFile
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneTreeModel.cpp
--- a/src/HordeSceneEditor/SceneTreeModel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneTreeModel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -33,15 +33,15 @@
 #include "QTerrainNode.h"
 
 
-#include <Qt/qstringlist.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qmime.h>
-#include <Qt/qsignalmapper.h>
-#include <Qt/qtreeview.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qsettings.h>
-#include <Qt/qapplication.h>
-#include <Qt/qdir.h>
+#include <QtCore/QStringList>
+#include <QtCore/QTextStream>
+#include <QtGui/qmime.h>
+#include <QtCore/QSignalMapper>
+#include <QtGui/QTreeView>
+#include <QtGui/QMessageBox>
+#include <QtCore/QSettings>
+#include <QtGui/QApplication>
+#include <QtCore/QDir>
 
 #include <Horde3D/Horde3D.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneTreeModel.h
--- a/src/HordeSceneEditor/SceneTreeModel.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneTreeModel.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define SCENETREEMODEL_H_
 
 #include <QXmlTree/QXmlTreeModel.h>
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
 
 class QSceneNode;
 class QReferenceNode;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneTreeView.cpp
--- a/src/HordeSceneEditor/SceneTreeView.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneTreeView.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -30,19 +30,19 @@
 #include "GLWidget.h"
 #include "CustomTypes.h"
 
-#include <Qt/qfile.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qpainter.h>
-#include <Qt/qapplication.h>
-#include <Qt/qdir.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qclipboard.h>
-#include <Qt/qmimedata.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qevent.h>
-#include <Qt/qaction.h>
-#include <Qt/qmenu.h>
-#include <Qt/qundostack.h>
+#include <QtCore/QFile>
+#include <QtGui/QMessageBox>
+#include <QtGui/QPainter>
+#include <QtGui/QApplication>
+#include <QtCore/QDir>
+#include <QtCore/QTextStream>
+#include <QtGui/QClipboard>
+#include <QtCore/QMimeData>
+#include <QtGui/QMessageBox>
+#include <QtCore/QEvent>
+#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QUndoStack>
 
 #include <QXmlTree/QXmlTreeUndoCommands.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneTreeView.h
--- a/src/HordeSceneEditor/SceneTreeView.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneTreeView.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #define SCENETREEVIEW_H_
 
 #include <QXmlTree/QXmlTreeView.h>
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
 
 class QAction;
 class QXmlTreeNode;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneWizard.cpp
--- a/src/HordeSceneEditor/SceneWizard.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneWizard.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -33,13 +33,13 @@
 #include "TerrainNodePage.h"
 #include "CameraNodePage.h"
 
-#include <Qt/qlayout.h>
-#include <Qt/qlabel.h>
-#include <Qt/qlineedit.h>
-#include <Qt/qdir.h>
-#include <Qt/qdom.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qtextstream.h>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtCore/QDir>
+#include <QtXml/qdom.h>
+#include <QtGui/QMessageBox>
+#include <QtCore/QTextStream>
 
 #include <math.h>
 #include <Horde3D/Horde3D.h>
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SceneWizard.h
--- a/src/HordeSceneEditor/SceneWizard.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SceneWizard.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,8 +23,8 @@
 #ifndef SCENEWIZARD_H_
 #define SCENEWIZARD_H_
 
-#include <Qt/qwizard.h>
-#include <Qt/qdom.h>
+#include <QtGui/QWizard>
+#include <QtXml/qdom.h>
 
 class SceneFile;
 class QLineEdit;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/SettingsDialog.cpp
--- a/src/HordeSceneEditor/SettingsDialog.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/SettingsDialog.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -21,18 +21,18 @@
 // ****************************************************************************************
 
 #include "SettingsDialog.h"
+#include "QHordeSceneEditorSettings.h"
 
-#include <Qt/qsettings.h>
-#include <Qt/qdir.h>
-#include <Qt/qfiledialog.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qsignalmapper.h>
+#include <QtCore/QDir>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
+#include <QtCore/QSignalMapper>
 
 SettingsDialog::SettingsDialog(QWidget* parent /*= 0*/, Qt::WFlags flags /*= 0*/) : QDialog(parent, flags), m_restart(false)
 {
 	setupUi(this);
 	m_mapper = new QSignalMapper(this);
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("General");
 	m_shaderEditor->setText(settings.value("ShaderEditor", "notepad.exe").toString());
 	m_plugInPath->setText(settings.value("PlugInPath", QApplication::applicationDirPath()+QDir::separator()+"plugins").toString());
@@ -138,7 +138,7 @@
 {
 	if (m_restart)
 		QMessageBox::information(this, tr("Attention"), tr("At least one change you made requires a restart of the application!"));
-	QSettings settings(QApplication::applicationDirPath()+QDir::separator()+"HordeSceneEditor.ini", QSettings::IniFormat);
+	QHordeSceneEditorSettings settings;
 	settings.beginGroup("General");	
 	if ( !m_styleCombo->currentText().isEmpty() )
 		settings.setValue("Style", m_styleCombo->currentText());
@@ -216,4 +216,4 @@
 		else if (m_resetSelectButton->currentIndex() == m_cameraMoveButton->currentIndex())
 			m_resetSelectButton->setCurrentIndex( (m_resetSelectButton->currentIndex() + 1 ) % 3 );
 	}
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ShaderComboBox.cpp
--- a/src/HordeSceneEditor/ShaderComboBox.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ShaderComboBox.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 
 #include "ShaderComboBox.h"
 
-#include <Qt/qdir.h>
+#include <QtCore/QDir>
 #include "HordeFileDialog.h"
 
 ShaderComboBox::ShaderComboBox(QWidget* parent /*= 0*/) : QComboBox(parent)
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ShaderComboBox.h
--- a/src/HordeSceneEditor/ShaderComboBox.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ShaderComboBox.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef SHADERCOMBOBOX_H_
 #define SHADERCOMBOBOX_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 #include "CustomTypes.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/TerrainNodePage.h
--- a/src/HordeSceneEditor/TerrainNodePage.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/TerrainNodePage.h	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 #ifndef TERRAINNODEPAGE_H_
 #define TERRAINNODEPAGE_H_
 
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 #include "./ui_TerrainNodePage.h"
 
@@ -36,4 +36,4 @@
 	void initializePage();
 
 };
-#endif
\ No newline at end of file
+#endif
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/TextureComboBox.cpp
--- a/src/HordeSceneEditor/TextureComboBox.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/TextureComboBox.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,7 +22,7 @@
 
 #include "TextureComboBox.h"
 
-#include <Qt/qdir.h>
+#include <QtCore/QDir>
 #include <Horde3D/Horde3D.h>
 #include "HordeFileDialog.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/TextureComboBox.h
--- a/src/HordeSceneEditor/TextureComboBox.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/TextureComboBox.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef TEXTURECOMBOBOX_H_
 #define TEXTURECOMBOBOX_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 #include "CustomTypes.h"
 class QDir;
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/ToolPlugIn.h
--- a/src/HordeSceneEditor/ToolPlugIn.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/ToolPlugIn.h	Wed Apr 16 10:17:28 2008 -0400
@@ -28,9 +28,8 @@
 #ifndef TOOLPLUGIN_H_
 #define TOOLPLUGIN_H_
 
-#include <Qt/qplugin.h>
-#include <Qt/qaction.h>
-#include <Qt/qlist.h>
+#include <QtGui/QAction>
+#include <QtCore/QList>
 
 class SceneFile;
 
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/Vec3fProperty.cpp
--- a/src/HordeSceneEditor/Vec3fProperty.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/Vec3fProperty.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #include "Vec3fProperty.h"
 #include "CustomTypes.h"
 
-#include <Qt/qregexp.h>
+#include <QtCore/QRegExp>
 
 Vec3fProperty::Vec3fProperty(const QString& name /*= QString()*/, QObject* propertyObject /*= 0*/, QObject* parent /*= 0*/) : Property(name, propertyObject, parent)
 {
@@ -134,4 +134,4 @@
 		pos += rx.matchedLength();
 	}
 	return componentHints;
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/HordeSceneEditor/main.cpp
--- a/src/HordeSceneEditor/main.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/HordeSceneEditor/main.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -20,9 +20,9 @@
 //
 // ****************************************************************************************
 
-#include <Qt/qapplication.h>
-#include <Qt/qsettings.h>
-#include <Qt/qsplashscreen.h>
+#include <QtGui/QApplication>
+#include <QtCore/QSettings>
+#include <QtGui/QSplashScreen>
 #include "HordeSceneEditor.h"
 
 
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/ColorCombo.cpp
--- a/src/QPropertyEditor/ColorCombo.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/ColorCombo.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -27,7 +27,7 @@
 
 #include "ColorCombo.h"
 
-#include <Qt/qcolordialog.h>
+#include <QtGui/QColorDialog>
 
 ColorCombo::ColorCombo(QWidget* parent /*= 0*/) : QComboBox(parent)
 {	
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/ColorCombo.h
--- a/src/QPropertyEditor/ColorCombo.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/ColorCombo.h	Wed Apr 16 10:17:28 2008 -0400
@@ -28,7 +28,7 @@
 #ifndef COLORCOMBO_H_
 #define COLORCOMBO_H_
 
-#include <Qt/qcombobox.h>
+#include <QtGui/QComboBox>
 
 class ColorCombo : public QComboBox
 {
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/Property.cpp
--- a/src/QPropertyEditor/Property.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/Property.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -23,8 +23,8 @@
 #include "Property.h"
 #include "ColorCombo.h"
 
-#include <Qt/qmetaobject.h>
-#include <Qt/qspinbox.h>
+#include <QtCore/QMetaProperty>
+#include <QtGui/QSpinBox>
 
 Property::Property(const QString& name /*= QString()*/, QObject* propertyObject /*= 0*/, QObject* parent /*= 0*/) : QObject(parent), 
 m_propertyObject(propertyObject)
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/Property.h
--- a/src/QPropertyEditor/Property.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/Property.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,9 +25,9 @@
 #ifndef PROPERTY_H_
 #define PROPERTY_H_
 
-#include <Qt/qwidget.h>
-#include <Qt/qstyleoption.h>
-#include <Qt/qvariant.h>
+#include <QtGui/QWidget>
+#include <QtGui/QStyleOption>
+#include <QtCore/QVariant>
 
 /**
  * The Property class is the base class for all properties in the QPropertyEditor
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QPropertyEditor.pro
--- a/src/QPropertyEditor/QPropertyEditor.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QPropertyEditor.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -17,7 +17,7 @@
 INCLUDEPATH+=../../include
 DESTDIR = ../../lib
 UI_DIR = .
-
+
 CONFIG(debug, debug|release) { 
 	TARGET = QPropertyEditord
 	OBJECTS_DIR = ../../Build/QPropertyEditor/Debug
@@ -39,4 +39,10 @@
 
 win32 {
 	system(xcopy /y *.h ..\..\include\QPropertyEditor\)
-}
+}
+
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QPropertyEditorWidget.h
--- a/src/QPropertyEditor/QPropertyEditorWidget.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QPropertyEditorWidget.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 #ifndef QPROPERTYEDITORWIDGET_H_
 #define QPROPERTYEDITORWIDGET_H_
 
-#include <Qt/qtreeview.h>
+#include <QtGui/QTreeView>
 
 class QPropertyModel;
 class Property;
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QPropertyModel.cpp
--- a/src/QPropertyEditor/QPropertyModel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QPropertyModel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,9 +26,9 @@
 
 #include "Property.h"
 
-#include <Qt/qapplication.h>
-#include <Qt/qmetaobject.h>
-#include <Qt/qitemeditorfactory.h>
+#include <QtGui/QApplication>
+#include <QtCore/QMetaProperty>
+#include <QtGui/QItemEditorFactory>
 
 struct PropertyPair
 {
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QPropertyModel.h
--- a/src/QPropertyEditor/QPropertyModel.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QPropertyModel.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,8 +24,8 @@
 #ifndef QPROPERTYMODEL_H_
 #define QPROPERTYMODEL_H_
 
-#include <Qt/qabstractitemmodel.h>
-#include <Qt/qmap.h>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QMap>
 
 #include "QPropertyEditorWidget.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QVariantDelegate.cpp
--- a/src/QPropertyEditor/QVariantDelegate.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QVariantDelegate.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,8 +26,8 @@
 
 #include "Property.h"
 
-#include <Qt/qabstractitemview.h>
-#include <Qt/qsignalmapper.h>
+#include <QtGui/QAbstractItemView>
+#include <QtCore/QSignalMapper>
 
 
 QVariantDelegate::QVariantDelegate(QObject* parent) : QItemDelegate(parent)
diff -r 3727e992ba86 -r 97e055f9873b src/QPropertyEditor/QVariantDelegate.h
--- a/src/QPropertyEditor/QVariantDelegate.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QPropertyEditor/QVariantDelegate.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 #ifndef COLORSELECTIONBUTTON_H_
 #define COLORSELECTIONBUTTON_H_
 
-#include <Qt/qitemdelegate.h>
+#include <QtGui/QItemDelegate>
 
 class QSignalMapper;
 
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlNodePropertyCommand.h
--- a/src/QXmlTree/QXmlNodePropertyCommand.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlNodePropertyCommand.h	Wed Apr 16 10:17:28 2008 -0400
@@ -26,8 +26,8 @@
 #include "QXmlTreeNode.h"
 #include "QXmlTreeModel.h"
 
-#include <Qt/qpointer.h>
-#include <Qt/qapplication.h>
+#include <QtCore/QPointer>
+#include <QtGui/QApplication>
 
 /**
  * Undo Command to change a property
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTree.pro
--- a/src/QXmlTree/QXmlTree.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTree.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -30,6 +30,12 @@
 	DEFINES+=QT_NO_DEBUG	
 }
 
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
+
 unix {	
 	system(mkdir -p ../../include/QXmlTree)
 	system(cp *.h ../../include/QXmlTree)
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeModel.cpp
--- a/src/QXmlTree/QXmlTreeModel.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeModel.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -116,4 +116,4 @@
 void QXmlTreeModel::updateIndex(const QModelIndex& index)
 {
 	emit dataChanged(index, index);
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeModel.h
--- a/src/QXmlTree/QXmlTreeModel.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeModel.h	Wed Apr 16 10:17:28 2008 -0400
@@ -22,9 +22,9 @@
 #ifndef QXMLTREEMODEL_H_
 #define QXMLTREEMODEL_H_
 
-#include <Qt/qabstractitemmodel.h>
-#include <Qt/qdom.h>
-#include <Qt/qundostack.h>
+#include <QtCore/QAbstractItemModel>
+#include <QtXml/qdom.h>
+#include <QtGui/QUndoStack>
 
 class QXmlTreeNode;
 
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeNode.h
--- a/src/QXmlTree/QXmlTreeNode.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeNode.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,10 +23,10 @@
 #ifndef QXMLTREENODE_H_
 #define QXMLTREENODE_H_
 
-#include <Qt/qobject.h>
-#include <Qt/qdom.h>
-#include <Qt/qlist.h>
-#include <Qt/qstringlist.h>
+#include <QtCore/QObject>
+#include <QtXml/qdom.h>
+#include <QtCore/QList>
+#include <QtCore/QStringList>
 
 class QXmlTreeModel;
 
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeUndoCommands.cpp
--- a/src/QXmlTree/QXmlTreeUndoCommands.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeUndoCommands.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 #include "QXmlTreeNode.h"
 #include "QXmlTreeModel.h"
 
-#include <Qt/qapplication.h>
+#include <QtGui/QApplication>
 
 QAddXmlNodeUndoCommand::QAddXmlNodeUndoCommand(const QDomElement &node, const QDomElement &parent, QXmlTreeModel *model, const QString &text) : QUndoCommand(text), 
 		m_addNode(node), m_parentNode(parent), m_model(model)
@@ -71,4 +71,4 @@
 	Q_ASSERT(index.isValid());
 	m_model->removeRow(index.row(), index.parent());	
 	qApp->restoreOverrideCursor();
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeUndoCommands.h
--- a/src/QXmlTree/QXmlTreeUndoCommands.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeUndoCommands.h	Wed Apr 16 10:17:28 2008 -0400
@@ -26,9 +26,9 @@
 class QXmlTreeNode;
 class QXmlTreeModel;
 
-#include <Qt/qundostack.h>
-#include <Qt/qdom.h>
-#include <Qt/qabstractitemmodel.h>
+#include <QtGui/QUndoStack>
+#include <QtXml/qdom.h>
+#include <QtCore/QAbstractItemModel>
 
 class QRemoveXmlNodeUndoCommand : public QUndoCommand
 {
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeView.cpp
--- a/src/QXmlTree/QXmlTreeView.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeView.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,11 +26,11 @@
 #include "QXmlTreeNode.h"
 #include "QXmlTreeUndoCommands.h"
 
-#include <Qt/qtextstream.h>
-#include <Qt/qapplication.h>
-#include <Qt/qclipboard.h>
-#include <Qt/qmime.h>
-#include <Qt/qmessagebox.h>
+#include <QtCore/QTextStream>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/qmime.h>
+#include <QtGui/QMessageBox>
 
 QXmlTreeView::QXmlTreeView(QWidget* parent /*= 0*/) : QTreeView(parent)
 {
@@ -133,4 +133,4 @@
 QRemoveXmlNodeUndoCommand* QXmlTreeView::createRemoveUndoCommand(QXmlTreeNode* node, const QString& text) const
 {
 	return new QRemoveXmlNodeUndoCommand(node, text);
-}
\ No newline at end of file
+}
diff -r 3727e992ba86 -r 97e055f9873b src/QXmlTree/QXmlTreeView.h
--- a/src/QXmlTree/QXmlTreeView.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/QXmlTree/QXmlTreeView.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef QXMLTREEVIEW_H_
 #define QXMLTREEVIEW_H_
 
-#include <Qt/qtreeview.h>
+#include <QtGui/QTreeView>
 
 class QAddXmlNodeUndoCommand;
 class QRemoveXmlNodeUndoCommand;
diff -r 3727e992ba86 -r 97e055f9873b src/TerrainToolPlugIn/ConverterWizard.cpp
--- a/src/TerrainToolPlugIn/ConverterWizard.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/TerrainToolPlugIn/ConverterWizard.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,10 +22,10 @@
 
 #include "ConverterWizard.h"
 
-#include <Qt/qimagewriter.h>
-#include <Qt/qimagereader.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qfiledialog.h>
+#include <QtGui/QImageWriter>
+#include <QtGui/QImageReader>
+#include <QtGui/QMessageBox>
+#include <QtGui/QFileDialog>
 
 ConverterWizard::ConverterWizard(QWidget* parent /*= 0*/) : QWizardPage(parent)
 {
diff -r 3727e992ba86 -r 97e055f9873b src/TerrainToolPlugIn/ConverterWizard.h
--- a/src/TerrainToolPlugIn/ConverterWizard.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/TerrainToolPlugIn/ConverterWizard.h	Wed Apr 16 10:17:28 2008 -0400
@@ -25,7 +25,7 @@
 
 #include "./ui_ConverterWizard.h"
 
-#include <Qt/qwizard.h>
+#include <QtGui/QWizard>
 
 class ConverterWizard : public QWizardPage, protected Ui_ConverterWizard
 {
diff -r 3727e992ba86 -r 97e055f9873b src/TerrainToolPlugIn/TerrainToolPlugIn.cpp
--- a/src/TerrainToolPlugIn/TerrainToolPlugIn.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/TerrainToolPlugIn/TerrainToolPlugIn.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -25,14 +25,14 @@
 #include "SceneFile.h"
 #include "ConverterWizard.h"
 
-#include <Qt/qfiledialog.h>
-#include <Qt/qimagereader.h>
-#include <Qt/qfileinfo.h>
-#include <Qt/qmessagebox.h>
-#include <Qt/qfile.h>
-#include <Qt/qtextstream.h>
-#include <Qt/qprogressdialog.h>
-#include <Qt/qdir.h>
+#include <QtGui/QFileDialog>
+#include <QtGui/QImageReader>
+#include <QtCore/QFileInfo>
+#include <QtGui/QMessageBox>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtGui/QProgressDialog>
+#include <QtCore/QDir>
 
 #include <math.h>
 
diff -r 3727e992ba86 -r 97e055f9873b src/TerrainToolPlugIn/TerrainToolPlugIn.h
--- a/src/TerrainToolPlugIn/TerrainToolPlugIn.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/TerrainToolPlugIn/TerrainToolPlugIn.h	Wed Apr 16 10:17:28 2008 -0400
@@ -23,7 +23,7 @@
 #ifndef TERRAINTOOLPLUGIN_H_
 #define TERRAINTOOLPLUGIN_H_
 
-#include <Qt/qobject.h>
+#include <QtCore/QObject>
 
 #include "../HordeSceneEditor/ToolPlugIn.h"
 
diff -r 3727e992ba86 -r 97e055f9873b src/TerrainToolPlugIn/TerrainToolPlugIn.pro
--- a/src/TerrainToolPlugIn/TerrainToolPlugIn.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/TerrainToolPlugIn/TerrainToolPlugIn.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -35,5 +35,8 @@
 	DEFINES+=QT_NO_DEBUG	
 }
 
-
-
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
diff -r 3727e992ba86 -r 97e055f9873b src/psdPlugIn/main.cpp
--- a/src/psdPlugIn/main.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/psdPlugIn/main.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -22,8 +22,8 @@
 //
 // ****************************************************************************************
 
-#include <Qt/qimageiohandler.h>
-#include <Qt/qstringlist.h>
+#include <QtGui/QImageIOHandler>
+#include <QtCore/QStringList>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff -r 3727e992ba86 -r 97e055f9873b src/psdPlugIn/psdPlugIn.pro
--- a/src/psdPlugIn/psdPlugIn.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/psdPlugIn/psdPlugIn.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -16,7 +16,8 @@
 DESTDIR  = ../../bin/plugins/imageformats
 
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
-INSTALLS += target
+INSTALLS += target
+
 CONFIG(debug, debug|release) {	
 	TARGET  = qpsdd
 	MOC_DIR = ../../Build/psdPlugIn/Debug
@@ -28,3 +29,9 @@
 	MOC_DIR = ../../Build/psdPlugIn/Release
 	OBJECTS_DIR = ../../Build/psdPlugIn/Release
 }
+
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
diff -r 3727e992ba86 -r 97e055f9873b src/psdPlugIn/qpsdhandler.cpp
--- a/src/psdPlugIn/qpsdhandler.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/psdPlugIn/qpsdhandler.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -26,9 +26,9 @@
 
 #include <assert.h>
 
-#include <Qt/qimage.h>
-#include <Qt/qdatastream.h>
-#include <Qt/qvariant.h>
+#include <QtGui/QImage>
+#include <QtCore/QDataStream>
+#include <QtCore/QVariant>
 
 typedef quint32 uint;
 typedef quint16 ushort;
diff -r 3727e992ba86 -r 97e055f9873b src/psdPlugIn/qpsdhandler.h
--- a/src/psdPlugIn/qpsdhandler.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/psdPlugIn/qpsdhandler.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #ifndef QPSDHANDLER_H
 #define QPSDHANDLER_H
 
-#include <Qt/qimageiohandler.h>
+#include <QtGui/QImageIOHandler>
 
 class QPsdHandler : public QImageIOHandler
 {
diff -r 3727e992ba86 -r 97e055f9873b src/tgaPlugIn/main.cpp
--- a/src/tgaPlugIn/main.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/tgaPlugIn/main.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -21,8 +21,8 @@
 **
 ****************************************************************************/
 
-#include <Qt/qimageiohandler.h>
-#include <Qt/qstringlist.h>
+#include <QtGui/QImageIOHandler>
+#include <QtCore/QStringList>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff -r 3727e992ba86 -r 97e055f9873b src/tgaPlugIn/qtgahandler.cpp
--- a/src/tgaPlugIn/qtgahandler.cpp	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/tgaPlugIn/qtgahandler.cpp	Wed Apr 16 10:17:28 2008 -0400
@@ -20,9 +20,9 @@
 
 #include <assert.h>
 
-#include <Qt/qimage.h>
-#include <Qt/qdatastream.h>
-#include <Qt/qvariant.h>
+#include <QtGui/QImage>
+#include <QtCore/QDataStream>
+#include <QtCore/QVariant>
 
 typedef quint32 uint;
 typedef quint16 ushort;
diff -r 3727e992ba86 -r 97e055f9873b src/tgaPlugIn/qtgahandler.h
--- a/src/tgaPlugIn/qtgahandler.h	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/tgaPlugIn/qtgahandler.h	Wed Apr 16 10:17:28 2008 -0400
@@ -24,7 +24,7 @@
 #ifndef QTGAHANDLER_H
 #define QTGAHANDLER_H
 
-#include <Qt/qimageiohandler.h>
+#include <QtGui/QImageIOHandler>
 
 class QTgaHandler : public QImageIOHandler
 {
diff -r 3727e992ba86 -r 97e055f9873b src/tgaPlugIn/tgaPlugIn.pro
--- a/src/tgaPlugIn/tgaPlugIn.pro	Mon Apr 14 15:09:51 2008 -0400
+++ b/src/tgaPlugIn/tgaPlugIn.pro	Wed Apr 16 10:17:28 2008 -0400
@@ -28,3 +28,9 @@
 	MOC_DIR = ../../Build/tgaPlugIn/Release
 	OBJECTS_DIR = ../../Build/tgaPlugIn/Release
 }
+
+macx {
+	CONFIG += x86 ppc
+	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+	QMAKE_LFLAGS += -mmacosx-version-min=10.4
+}
