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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
	src/plugins/texteditor/fontsettingspage.cpp

Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
This commit is contained in:
Eike Ziller
2022-08-31 11:03:13 +02:00
parent ad4fed86ca 60a045299d
commit a2f21d40f5
100 changed files with 603 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
View File

@@ -67,7 +67,7 @@
\code
singleton Values 1.0 Values.qml
\endcode
\li Open \e Values.qml in \l{Text Editor} for editing.
\li Open \e Values.qml in the \l{Code} view for editing.
\li Add the following code to the top of the file to register the
QObject-derived class that you will use to expose the global
properties as a singleton type:
@@ -116,7 +116,7 @@
\code
import Data 1.0
\endcode
\li Returning to the \uicontrol {Form Editor}, locate the property that
\li Returning to the \uicontrol {2D} view, locate the property that
should be bound to the simulated values. Select \inlineimage icons/action-icon.png
and \uicontrol {Set Binding} for the property and enter the
simulated Value property. For example, you would set the following