diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-06 12:38:51 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-10 15:55:52 +0100 |
| commit | 32b506d1db1f8cee748a27b548ba8208f2928058 (patch) | |
| tree | 2d5b23baafe22ccc3518719f8f5d19bb846b2b61 /src/tools/bootstrap/bootstrap.pro | |
| parent | 2cb1db64370989fffeec313c196fe573c479e6aa (diff) | |
| parent | c0948d508e7179e2e23c893ba6152c40400de060 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.11
Conflicts:
src/corelib/tools/qvarlengtharray.qdoc
src/corelib/tools/qvector.qdoc
Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.
Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index a88333f03a..a45382106a 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -32,7 +32,6 @@ SOURCES += \ ../../corelib/global/qrandom.cpp \ ../../corelib/io/qabstractfileengine.cpp \ ../../corelib/io/qbuffer.cpp \ - ../../corelib/io/qdatastream.cpp \ ../../corelib/io/qdebug.cpp \ ../../corelib/io/qdir.cpp \ ../../corelib/io/qdiriterator.cpp \ @@ -47,7 +46,6 @@ SOURCES += \ ../../corelib/io/qresource.cpp \ ../../corelib/io/qtemporarydir.cpp \ ../../corelib/io/qtemporaryfile.cpp \ - ../../corelib/io/qtextstream.cpp \ ../../corelib/io/qsavefile.cpp \ ../../corelib/io/qstandardpaths.cpp \ ../../corelib/io/qloggingcategory.cpp \ @@ -58,6 +56,17 @@ SOURCES += \ ../../corelib/kernel/qvariant.cpp \ ../../corelib/kernel/qsystemerror.cpp \ ../../corelib/plugin/quuid.cpp \ + ../../corelib/serialization/qdatastream.cpp \ + ../../corelib/serialization/qjson.cpp \ + ../../corelib/serialization/qjsondocument.cpp \ + ../../corelib/serialization/qjsonobject.cpp \ + ../../corelib/serialization/qjsonarray.cpp \ + ../../corelib/serialization/qjsonvalue.cpp \ + ../../corelib/serialization/qjsonparser.cpp \ + ../../corelib/serialization/qjsonwriter.cpp \ + ../../corelib/serialization/qtextstream.cpp \ + ../../corelib/serialization/qxmlutils.cpp \ + ../../corelib/serialization/qxmlstream.cpp \ ../../corelib/tools/qbitarray.cpp \ ../../corelib/tools/qbytearray.cpp \ ../../corelib/tools/qarraydata.cpp \ @@ -84,15 +93,6 @@ SOURCES += \ ../../corelib/tools/qstringlist.cpp \ ../../corelib/tools/qversionnumber.cpp \ ../../corelib/tools/qvsnprintf.cpp \ - ../../corelib/xml/qxmlutils.cpp \ - ../../corelib/xml/qxmlstream.cpp \ - ../../corelib/json/qjson.cpp \ - ../../corelib/json/qjsondocument.cpp \ - ../../corelib/json/qjsonobject.cpp \ - ../../corelib/json/qjsonarray.cpp \ - ../../corelib/json/qjsonvalue.cpp \ - ../../corelib/json/qjsonparser.cpp \ - ../../corelib/json/qjsonwriter.cpp \ ../../xml/dom/qdom.cpp \ ../../xml/sax/qxml.cpp |