From db345cb624d59b8c4e4f551d05b2faeeaccfb2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= <skowri@gmail.com>
Date: Fri, 25 Dec 2015 07:55:26 +0100
Subject: [PATCH] Change includes in Spreadsheet to be compatible with Qt5.

This change is Qt4/Qt5 neutral.
---
 src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp |  5 +++++
 src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp     | 20 +++++++++----------
 src/Mod/Spreadsheet/Gui/qtcolorpicker.h       |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
index 14f5461f252f..26526329bdaf 100644
--- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
+++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
@@ -22,7 +22,12 @@
 #include "Workbench.h"
 #include "ViewProviderSpreadsheet.h"
 #include "SpreadsheetView.h"
+
+#if QT_VERSION >= 0x050000
+#include "qrc_Spreadsheet.cpp"
+#else
 #include "qrc_Spreadsheet.cxx"
+#endif
 
 // use a different name to CreateCommand()
 void CreateSpreadsheetCommands(void);
diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
index 5bb793cec338..0dbd17b7c115 100644
--- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
+++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
@@ -44,20 +44,20 @@
 ** 
 ****************************************************************************/
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QPainter>
-#include <QtGui/QPushButton>
-#include <QtGui/QColorDialog>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QPainter>
+#include <QPushButton>
+#include <QColorDialog>
 #include <QtCore/QMap>
-#include <QtGui/QLayout>
-#include <QtGui/QStyle>
-#include <QtGui/QLabel>
-#include <QtGui/QToolTip>
+#include <QLayout>
+#include <QStyle>
+#include <QLabel>
+#include <QToolTip>
 #include <QtGui/QPixmap>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QPaintEvent>
-#include <QtGui/QGridLayout>
+#include <QGridLayout>
 #include <QtGui/QHideEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QShowEvent>
diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h
index 7b10da332190..4f1a405ed97b 100644
--- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h
+++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h
@@ -46,11 +46,11 @@
 
 #ifndef QTCOLORPICKER_H
 #define QTCOLORPICKER_H
-#include <QtGui/QPushButton>
+#include <QPushButton>
 #include <QtCore/QString>
 #include <QtGui/QColor>
 
-#include <QtGui/QLabel>
+#include <QLabel>
 #include <QtCore/QEvent>
 #include <QtGui/QFocusEvent>