From ce04dcdcf2f85e417e1d3aaad61b95eaccae401d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 28 May 2021 06:51:32 +0200 Subject: [PATCH] QmlDesigner: Fix Qbs and qmake build Amends 4786b03594fedf77d48f64deee6c782ce99f5f72. Change-Id: I0355d5858f744a2e91f9e6c2e298bf2a660e7559 Reviewed-by: Miikka Heikkinen Reviewed-by: Tim Jenssen --- .../components/itemlibrary/itemlibrary.pri | 14 ++++++++++---- src/plugins/qmldesigner/qmldesignerplugin.qbs | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri index 8099c878536..d1059d11d74 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri @@ -5,7 +5,6 @@ HEADERS += itemlibraryview.h \ $$PWD/itemlibraryiconimageprovider.h \ itemlibrarywidget.h \ itemlibrarymodel.h \ - itemlibraryresourceview.h \ itemlibraryimageprovider.h \ itemlibraryitem.h \ itemlibrarycategory.h \ @@ -15,7 +14,11 @@ HEADERS += itemlibraryview.h \ itemlibraryaddimportmodel.h \ itemlibraryassetimportdialog.h \ itemlibraryassetimporter.h \ - customfilesystemmodel.h \ + itemlibraryassetsdir.h \ + itemlibraryassetsdirsmodel.h \ + itemlibraryassetsfilesmodel.h \ + itemlibraryassetsiconprovider.h \ + itemlibraryassetsmodel.h \ assetimportupdatedialog.h \ assetimportupdatetreeitem.h \ assetimportupdatetreeitemdelegate.h \ @@ -26,7 +29,6 @@ SOURCES += itemlibraryview.cpp \ $$PWD/itemlibraryiconimageprovider.cpp \ itemlibrarywidget.cpp \ itemlibrarymodel.cpp \ - itemlibraryresourceview.cpp \ itemlibraryimageprovider.cpp \ itemlibraryitem.cpp \ itemlibrarycategory.cpp \ @@ -36,7 +38,11 @@ SOURCES += itemlibraryview.cpp \ itemlibraryaddimportmodel.cpp \ itemlibraryassetimportdialog.cpp \ itemlibraryassetimporter.cpp \ - customfilesystemmodel.cpp \ + itemlibraryassetsdir.cpp \ + itemlibraryassetsdirsmodel.cpp \ + itemlibraryassetsfilesmodel.cpp \ + itemlibraryassetsiconprovider.cpp \ + itemlibraryassetsmodel.cpp \ assetimportupdatedialog.cpp \ assetimportupdatetreeitem.cpp \ assetimportupdatetreeitemdelegate.cpp \ diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 599620fd02b..ff972573ddd 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -625,6 +625,16 @@ Project { "itemlibrary/itemlibraryassetimportdialog.ui", "itemlibrary/itemlibraryassetimporter.cpp", "itemlibrary/itemlibraryassetimporter.h", + "itemlibrary/itemlibraryassetsdir.cpp", + "itemlibrary/itemlibraryassetsdir.h", + "itemlibrary/itemlibraryassetsdirsmodel.cpp", + "itemlibrary/itemlibraryassetsdirsmodel.h", + "itemlibrary/itemlibraryassetsfilesmodel.cpp", + "itemlibrary/itemlibraryassetsfilesmodel.h", + "itemlibrary/itemlibraryassetsiconprovider.cpp", + "itemlibrary/itemlibraryassetsiconprovider.h", + "itemlibrary/itemlibraryassetsmodel.cpp", + "itemlibrary/itemlibraryassetsmodel.h", "itemlibrary/itemlibrarycategoriesmodel.cpp", "itemlibrary/itemlibrarycategoriesmodel.h", "itemlibrary/itemlibrarycategory.cpp", @@ -639,14 +649,10 @@ Project { "itemlibrary/itemlibraryitemsmodel.h", "itemlibrary/itemlibrarymodel.cpp", "itemlibrary/itemlibrarymodel.h", - "itemlibrary/itemlibraryresourceview.cpp", - "itemlibrary/itemlibraryresourceview.h", "itemlibrary/itemlibraryview.cpp", "itemlibrary/itemlibraryview.h", "itemlibrary/itemlibrarywidget.cpp", "itemlibrary/itemlibrarywidget.h", - "itemlibrary/customfilesystemmodel.cpp", - "itemlibrary/customfilesystemmodel.h", "itemlibrary/itemlibraryiconimageprovider.cpp", "itemlibrary/itemlibraryiconimageprovider.h", "navigator/iconcheckboxitemdelegate.cpp",