feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp

and compile fix in materialbrowserview.cpp

Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
This commit is contained in:
Tim Jenssen
2022-10-04 15:21:56 +02:00
parent 993fd2a92a 47887da778
commit 964f539e55
91 changed files with 719 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
View File

@@ -27,7 +27,7 @@
working Qt 6 application that you can build and run in Qt Creator using
CMake. Therefore, you can open, build, and run the projects with Qt Creator.
\QDS continues to use the \e .qmlproject file format, while \QC uses a
\QDS continues to use the \e .qmlproject file format, while Qt Creator uses a
\e CMakeLists.txt file as the project file. This enables you to share
your project as a fully working C++ application with developers.
@@ -46,9 +46,10 @@
\section1 Converting Project Structure for CMake
\QDS can generate \e CMakeLists.txt and other related files to use with \QC and to compile into
an executable application but only if the project has a certain folder structure. If you have a
\QDS QML project that doesn't have the CMake configuration, follow these steps to convert its
\QDS can generate \e CMakeLists.txt and other related files to use with
Qt Creator and to compile into an executable application but only if the
project has a certain folder structure. If you have a \QDS QML project that
doesn't have the CMake configuration, follow these steps to convert its
file structure to the correct format.
\list 1