diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-09 21:05:56 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-01-15 10:00:34 +0100 |
| commit | d6c61e16437b5c31b73ada65471532625ae19ecc (patch) | |
| tree | 3f0e7d03a64a04219e9261008a6d3c817f320194 | |
| parent | b89afa69be69600809c046cf0fefa7af31ad54bc (diff) | |
generate_ui: make the generated code compile for uic
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>
| -rw-r--r-- | src/designer/data/generate_header.xsl | 11 | ||||
| -rw-r--r-- | 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 <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 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 |