diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-14 15:29:20 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-14 14:30:09 +0000 |
| commit | 7f234ed768075dc14ea3b74f4531349851182aa5 (patch) | |
| tree | 25545aaae506361bfb3704583038977e28c7de62 /qtcreator_ide_branding.pri | |
| parent | a3fe24d1920806e2307b754d42959ba3d891c5cc (diff) | |
| parent | 249c3561cbccb978889b738f2d0ce8e41a1ac371 (diff) | |
| download | qt-creator-7f234ed768075dc14ea3b74f4531349851182aa5.tar.gz | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
Diffstat (limited to 'qtcreator_ide_branding.pri')
| -rw-r--r-- | qtcreator_ide_branding.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index 3fa9863d5d..4be9bfcd99 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -14,3 +14,4 @@ IDE_DOC_FILES_ONLINE = $$PWD/doc/qtcreator/qtcreator-online.qdocconf \ $$PWD/doc/qtcreatordev/qtcreator-dev-online.qdocconf IDE_DOC_FILES = $$PWD/doc/qtcreator/qtcreator.qdocconf \ $$PWD/doc/qtcreatordev/qtcreator-dev.qdocconf + |