diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-09 13:51:02 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-11-09 14:02:40 +0100 |
| commit | f9623b5ad69bbe6700b27f0cd8b6191c70994908 (patch) | |
| tree | ea4f2c298f7355d95abf34f13d17319087f68a37 /src/plugins/designer | |
| parent | 9fe7f657865250f4f0a26378947274967d884f12 (diff) | |
| download | qt-creator-f9623b5ad69bbe6700b27f0cd8b6191c70994908.tar.gz | |
Small include header fixes
QtXmlStream classes live in QtCore, not QtXml. Also add a few headers
that are not implicitly included in Qt 5 any more. This greatly eases
transition to Qt 5 which not having any side effects on the Qt 4 build.
Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/formwindoweditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 803c140aa3..ee485fec9e 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -164,7 +164,8 @@ bool FormWindowEditor::open(QString *errorString, const QString &fileName, const form->setFileName(absfileName); #if QT_VERSION >= 0x050000 const QByteArray contentsBA = contents.toUtf8(); - QBuffer str(&contentsBA); + QBuffer str; + str.setData(contentsBA); str.open(QIODevice::ReadOnly); if (!form->setContents(&str, errorString)) return false; |