diff --git a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml deleted file mode 100644 index 23fad843d29..00000000000 --- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - qt creator,build,compile - - - - qt creator,qt designer,widgets,c++,text - - - - qt,qt creator,qt designer,widgets,c++ - - - - qt creator,qt quick designer,qt quick,qml,states,transitions - - - - qt creator,qt quick designer,qml,android - - - - qt quick,qml,c++ - - - - qt creator - - - - qt creator,wizard - - - - qt creator,configuration - - - - qt creator,plugins - - - - qt quick,qt creator,qml profiler - - - - qt creator,cpu usage analyzer,perf - - - - qt creator,qt quick,qml,c++,android,sailfishos - - - - qt creator,qbs,qemu - - - - qt creator,android - - - - qt,android - - - - qt creator,ios - - - - qt creator,baremetal - - - - qt,Windows 10 - - - - qt creator,Windows 10,demo - - - - qt, embedded, device creation - - - - qt quick,controls - - - - qt quick,layouts,bindings - - - - qt 3d,demo - - - - qml,qml profiler - - - - qt quick,widgets - - - - qt webengine - - - - qt webengine - - - - qt,qt creator,3d - - - - qt,qt quick,screen resolution - - - diff --git a/share/qtcreator/welcomescreen/widgets/images/dropshadow.png b/share/qtcreator/welcomescreen/widgets/images/dropshadow.png deleted file mode 100644 index 57339de6eff..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/dropshadow.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png b/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png deleted file mode 100644 index 54cdb6177de..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/components.png b/share/qtcreator/welcomescreen/widgets/images/icons/components.png deleted file mode 100644 index 87a6ba3269f..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/components.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png b/share/qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png deleted file mode 100644 index ebb55dad4b9..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qt_sdk.png b/share/qtcreator/welcomescreen/widgets/images/icons/qt_sdk.png deleted file mode 100644 index fbd06661e6d..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/qt_sdk.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/videoIcon.png b/share/qtcreator/welcomescreen/widgets/images/icons/videoIcon.png deleted file mode 100644 index a6525f8fd2b..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/videoIcon.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/videotutorialicon.png b/share/qtcreator/welcomescreen/widgets/images/icons/videotutorialicon.png deleted file mode 100644 index 6545eddbbf8..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/videotutorialicon.png and /dev/null differ diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 754ed3ffebd..2c3e337abe9 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -551,10 +551,9 @@ BaseQtVersion *ExamplesListModel::findHighestQtVersion() const QStringList ExamplesListModel::exampleSources(QString *examplesInstallPath, QString *demosInstallPath) { QStringList sources; - QString resourceDir = Core::ICore::resourcePath() + QLatin1String("/welcomescreen/"); // Qt Creator shipped tutorials - sources << (resourceDir + QLatin1String("/qtcreator_tutorials.xml")); + sources << ":/qtsupport/qtcreator_tutorials.xml"; QString examplesPath; QString demosPath; diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/androidapp.png b/src/plugins/qtsupport/images/icons/androidapp.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/androidapp.png rename to src/plugins/qtsupport/images/icons/androidapp.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png b/src/plugins/qtsupport/images/icons/buildrun.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png rename to src/plugins/qtsupport/images/icons/buildrun.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/ddays13.png b/src/plugins/qtsupport/images/icons/ddays13.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/ddays13.png rename to src/plugins/qtsupport/images/icons/ddays13.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/ddays14.png b/src/plugins/qtsupport/images/icons/ddays14.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/ddays14.png rename to src/plugins/qtsupport/images/icons/ddays14.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png b/src/plugins/qtsupport/images/icons/qtquick.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png rename to src/plugins/qtsupport/images/icons/qtquick.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png b/src/plugins/qtsupport/images/icons/qwidget.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png rename to src/plugins/qtsupport/images/icons/qwidget.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/tutorialicon.png b/src/plugins/qtsupport/images/icons/tutorialicon.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/tutorialicon.png rename to src/plugins/qtsupport/images/icons/tutorialicon.png diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/worldsummit15.png b/src/plugins/qtsupport/images/icons/worldsummit15.png similarity index 100% rename from share/qtcreator/welcomescreen/widgets/images/icons/worldsummit15.png rename to src/plugins/qtsupport/images/icons/worldsummit15.png diff --git a/share/qtcreator/welcomescreen/images_areaofinterest.xml b/src/plugins/qtsupport/images_areaofinterest.xml similarity index 100% rename from share/qtcreator/welcomescreen/images_areaofinterest.xml rename to src/plugins/qtsupport/images_areaofinterest.xml diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml new file mode 100644 index 00000000000..9e2db69aac0 --- /dev/null +++ b/src/plugins/qtsupport/qtcreator_tutorials.xml @@ -0,0 +1,125 @@ + + + + + + qt creator,build,compile + + + + qt creator,qt designer,widgets,c++,text + + + + qt,qt creator,qt designer,widgets,c++ + + + + qt creator,qt quick designer,qt quick,qml,states,transitions + + + + qt creator,qt quick designer,qml,android + + + + qt quick,qml,c++ + + + + qt creator + + + + qt creator,wizard + + + + qt creator,configuration + + + + qt creator,plugins + + + + qt quick,qt creator,qml profiler + + + + qt creator,cpu usage analyzer,perf + + + + qt creator,qt quick,qml,c++,android,sailfishos + + + + qt creator,qbs,qemu + + + + qt creator,android + + + + qt,android + + + + qt creator,ios + + + + qt creator,baremetal + + + + qt,Windows 10 + + + + qt creator,Windows 10,demo + + + + qt, embedded, device creation + + + + qt quick,controls + + + + qt quick,layouts,bindings + + + + qt 3d,demo + + + + qml,qml profiler + + + + qt quick,widgets + + + + qt webengine + + + + qt webengine + + + + qt,qt creator,3d + + + + qt,qt quick,screen resolution + + + diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc index 597f3a0982b..b5aacef1ec5 100644 --- a/src/plugins/qtsupport/qtsupport.qrc +++ b/src/plugins/qtsupport/qtsupport.qrc @@ -5,5 +5,15 @@ images/dark_qt_project.png images/dark_qt_qrc.png QtSupport.mimetypes.xml + images_areaofinterest.xml + qtcreator_tutorials.xml + images/icons/androidapp.png + images/icons/buildrun.png + images/icons/ddays13.png + images/icons/ddays14.png + images/icons/qtquick.png + images/icons/qwidget.png + images/icons/tutorialicon.png + images/icons/worldsummit15.png diff --git a/src/plugins/qtsupport/screenshotcropper.cpp b/src/plugins/qtsupport/screenshotcropper.cpp index 23d1464587f..1865826ebff 100644 --- a/src/plugins/qtsupport/screenshotcropper.cpp +++ b/src/plugins/qtsupport/screenshotcropper.cpp @@ -27,7 +27,6 @@ #include -#include #include #include #include @@ -45,7 +44,7 @@ public: AreasOfInterest::AreasOfInterest() { #ifdef QT_CREATOR - areas = ScreenshotCropper::loadAreasOfInterest(Core::ICore::resourcePath() + QLatin1String("/welcomescreen/images_areaofinterest.xml")); + areas = ScreenshotCropper::loadAreasOfInterest(":/qtsupport/images_areaofinterest.xml"); #endif // QT_CREATOR }