From 3cbe37d700c6d71c90dd0da378d130f28003b738 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Sun, 15 Jun 2014 18:41:54 +0200
Subject: [PATCH] Fixed build error that was caused by two widgets having the
 same filenames.

--HG--
branch : gsoc2014-dfighter
---
 code/studio/src/plugins/core/settings_dialog.cpp | 2 +-
 code/studio/src/plugins/core/settings_dialog.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/studio/src/plugins/core/settings_dialog.cpp b/code/studio/src/plugins/core/settings_dialog.cpp
index 4b7bbac3a..0b38e4e80 100644
--- a/code/studio/src/plugins/core/settings_dialog.cpp
+++ b/code/studio/src/plugins/core/settings_dialog.cpp
@@ -17,7 +17,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Project includes
-#include "settings_dialog.h"
+#include "../core/settings_dialog.h"
 #include "ioptions_page.h"
 
 // Qt includes
diff --git a/code/studio/src/plugins/core/settings_dialog.h b/code/studio/src/plugins/core/settings_dialog.h
index 9e1c86444..a90f88b18 100644
--- a/code/studio/src/plugins/core/settings_dialog.h
+++ b/code/studio/src/plugins/core/settings_dialog.h
@@ -19,7 +19,7 @@
 #ifndef SETTINGS_DIALOG_H
 #define SETTINGS_DIALOG_H
 
-#include "ui_settings_dialog.h"
+#include "../core/ui_settings_dialog.h"
 
 // Qt includes
 #include <QtCore/QList>