Commit Graph

8 Commits

Author SHA1 Message Date
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Mahmoud Badri
a7a4c9773b QmlDesigner: Add a default validator to ItemFilterComboBox
Change-Id: Iba8f3f42d7028bc5da5b5abd6d3581f67184376b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-03-14 08:58:18 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Leena Miettinen
1a90f06fe5 QML Designer: Fix UI text
Fix capitalization of strings and the wording of tooltips.

Task-number: QTCREATORBUG-27055
Change-Id: Id8e324b44574b9cf0d1522ae204b452cea6193cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-17 12:05:26 +00:00
Henning Gruendl
a6b7473350 QmlDesigner: Hide Audio-/VideoOutput for video
Hide controls for AudioOutput and VideoOutput in VideoSpecifics.

Change-Id: Icfb66d44cca815dd201c7beda33930ff86a5753e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-13 09:26:37 +00:00
Henning Gruendl
9dd6635970 QmlDesigner: Add VideoOutput
* Add VideoOutput
* Add ComboBoxes to MediaPlayer specifics for selecting audio and video
  output ids

Change-Id: I52ea764b1301492754676a97d8d122275ba6dd81
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-12-02 23:34:34 +00:00
Henning Gruendl
0484d574d6 QmlDesigner: Add QtMultimedia
Add property editor sheets and item library entries for QtMultimedia.

Task-number: QDS-5147
Change-Id: Ic4fc2926e7bf5aa5376f3fd7b6b5e452034e4001
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-03 18:56:10 +00:00