projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b89afa6)
generate_ui: make the generated code compile for uic
authorMarc Mutz <marc.mutz@kdab.com>
Fri, 9 Jan 2015 20:05:56 +0000 (21:05 +0100)
committerMarc Mutz <marc.mutz@kdab.com>
Thu, 15 Jan 2015 09:00:34 +0000 (10:00 +0100)
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 patch | blob | history
src/designer/src/lib/uilib/ui4_p.h patch | blob | history

diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl
index 579e01e..c9a2b0a 100644 (file)
--- 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 5828900..51a7074 100644 (file)
--- 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
 
Domain: UI Framework / Qt;