diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
| commit | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (patch) | |
| tree | 726ee71fc1be50cdda04cdc88a1447599f9d74ae /src/tools | |
| parent | dff3843d98d52e2c32fea07371f91117de0667e9 (diff) | |
| parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 3 | ||||
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 9863ff5e69..6230cc081d 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -63,8 +63,9 @@ SOURCES += \ ../../corelib/kernel/qsharedmemory.cpp \ ../../corelib/kernel/qsystemsemaphore.cpp \ ../../corelib/plugin/quuid.cpp \ + ../../corelib/serialization/qcborvalue.cpp \ ../../corelib/serialization/qdatastream.cpp \ - ../../corelib/serialization/qjson.cpp \ + ../../corelib/serialization/qjsoncbor.cpp \ ../../corelib/serialization/qjsondocument.cpp \ ../../corelib/serialization/qjsonobject.cpp \ ../../corelib/serialization/qjsonarray.cpp \ diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index fd5f8c9017..717bff4a51 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1680,7 +1680,7 @@ static void writeResourceIcon(QTextStream &output, "Selected", "Off"); } if (i->hasElementSelectedOn()) { - writeIconAddFile(output, indent, iconName, i->elementSelectedOff()->text(), + writeIconAddFile(output, indent, iconName, i->elementSelectedOn()->text(), "Selected", "On"); } } |