diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-04-22 12:18:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-04-22 12:18:10 +0200 |
| commit | e5640386f8118ed97cc7be372aedc06bcb65dbc4 (patch) | |
| tree | 9197eef275b882555612ee6d36904cc44ea05973 /src/plugins/python/pythonutils.cpp | |
| parent | d91d696e3aff23a085c8b7396fb4fc2382b929e8 (diff) | |
| parent | 89682a866e95a9b675b61fc7aa345b8b492bd1d8 (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I682b330a278a329fc6294baeff6a28040abd10bc
Diffstat (limited to 'src/plugins/python/pythonutils.cpp')
0 files changed, 0 insertions, 0 deletions