From d6c61e16437b5c31b73ada65471532625ae19ecc Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Fri, 9 Jan 2015 21:05:56 +0100
Subject: generate_ui: make the generated code compile for uic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These includes should also work when compiled for designer.

Change-Id: I1705e47f561589b0deec23dc773408835947c1fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
---
 src/designer/data/generate_header.xsl | 11 +++++------
 src/designer/src/lib/uilib/ui4_p.h    | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl
index 579e01eae..c9a2b0afb 100644
--- a/src/designer/data/generate_header.xsl
+++ b/src/designer/data/generate_header.xsl
@@ -388,12 +388,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include &lt;QtCore/QList&gt;
-#include &lt;QtCore/QString&gt;
-#include &lt;QtCore/QStringList&gt;
-#include &lt;QtCore/QXmlStreamReader&gt;
-#include &lt;QtCore/QXmlStreamWriter&gt;
-#include &lt;QtCore/qglobal.h&gt;
+#include &lt;qlist.h&gt;
+#include &lt;qstring.h&gt;
+#include &lt;qstringlist.h&gt;
+#include &lt;qxmlstream.h&gt;
+#include &lt;qglobal.h&gt;
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/uilib/ui4_p.h b/src/designer/src/lib/uilib/ui4_p.h
index 5828900bc..51a70749c 100644
--- a/src/designer/src/lib/uilib/ui4_p.h
+++ b/src/designer/src/lib/uilib/ui4_p.h
@@ -47,12 +47,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/qglobal.h>
+#include <qlist.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qxmlstream.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3