Commit Graph

65588 Commits

Author SHA1 Message Date
David Schulz
b55a313b3d TextEditor: make TextEditorWidget constructor explicit
Change-Id: I0b2e5b8c09706697efa4c2fbc3bc7483d02f68d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-04 10:14:30 +00:00
David Schulz
dba4bff703 TextEditor: use Utils::FilePath as file member in AssistInterface
Change-Id: I3bf9b013b9350411f918efdb9d1a36a2c22bf972
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-04 10:14:21 +00:00
David Schulz
339db00f85 Core: replace QString with Utils::FilePath to get documents
Change-Id: I01777c227398be8bd3bf877c5429b84a75aa361b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-04 10:14:14 +00:00
David Schulz
e4dec0484c ClangTools: Remove useless member FixitsRefactoringFile::m_filePath
Change-Id: I686eddeea7c52096175c3b2fe1a519e8fbf2c876
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-04 10:14:02 +00:00
David Schulz
7bbbdeac52 ClangTools: use VFSoverlay if the clang tool supports it
check the help output of a clang tool whether virtual file
system overlay is supported. Prepares for the vfso support
of clazy-standalone.

Change-Id: I157c94de1dda41c83945c9bc8a4c2e132b2e6551
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-04 09:48:44 +00:00
Eike Ziller
43ee53c233 CMake build: Qt6 build fixes
Set Qt5_VERSION for version checks (e.g. currently still JavaScript
locator filter).

Export special FindQt5.cmake for external plugins and super-repo builds.

Change-Id: I5edb8b0e8bef1a341cd2ff04a13d0a6ce22f6558
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-04 07:41:57 +00:00
Christian Stenger
80054d1971 Utils: Do not try to parse empty files
Change-Id: I204a20bf1fee3b1163f841de0e98c4da86c9a943
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-04 04:31:38 +00:00
Tasuku Suzuki
367d0dc4f7 Improve git archive userbility
Archive should be saved at one level upper directory from repo dir.
When user change archive name to e.g. project-v1.0, Qt Creator saves it
to project-v1.tar.gz now. It should be project-v1.0.tar.gz

Change-Id: Ibcd3c6bd8413bbb28fcdae13e5eb43016dc2b6a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-03 15:34:14 +00:00
Christian Kandeler
45dd074441 CPlusPlus: Categorize "Find Usages" results
That is, find out whether a certain access was a read, a write, a
declaration or something else, and report the result to upper layers.
Follow-up patches can make this information visible to users.

Task-number: QTCREATORBUG-12734
Task-number: QTCREATORBUG-19373
Change-Id: Iee79e39dd1eb5a986a7e27846991e0e01b2c3a2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 14:32:47 +00:00
Eike Ziller
0ceb9f487c CMake build: Check minimum Qt version
Change-Id: I81244c2480d647a2cf48885b2a125a02b11767b4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-03 12:11:34 +00:00
Morten Johan Sørvig
9c09d82251 Limit workaround to 5.14.0
QTBUG-80934 was fixed in Qt 5.14.1.

Change-Id: I3f9f2a629bce40b13ad8836ae4b0f4a710241d49
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-03 11:26:33 +00:00
The Qt Project
e4cc659444 Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-09-03 10:18:31 +00:00
Eike Ziller
3b76714290 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml

Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
2020-09-03 12:18:02 +02:00
Eike Ziller
6cff79d377 CMake build: Support building clang tooling without static libs
Create a FindClang.cmake and move all Clang configuration there.
Find Clang and choose static libraries if available, otherwise use
clang-cpp if available.
Add option to link to clang-cpp even if static libraries are available.

Fixes: QTCREATORBUG-23172
Change-Id: If40304d174469df0c786259e724cbee8de0e2d0e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-03 10:03:45 +00:00
Leena Miettinen
1074dab467 Doc: Update info about exporting 2D assets from Sketch
Change-Id: Iec58bb071cdde7eaab3d84f6d06f9d646f341524
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-09-03 08:49:15 +00:00
Aleksei German
b11bfd5652 QmlDesigner: Disable more properties for QUL
Disabling more items in ItemLibrary and properties

Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-03 08:39:26 +00:00
hjk
5b8846a4f8 Nim: Rework NimCompilerBuildStep
Use new ProjectExplorer infrastructure.

Change-Id: Id8fed337895f9f18fec44f4756493f40ea07f3da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 08:10:47 +00:00
Orgad Shaneh
fd32b222ee LLDB: Escape strings for correct parsing
Sample broken output:
>result={token="9",lldbid="1",valid="1",hitcount="0",threadid="0",oneshot="0",
condition="",enabled="1",valid="1",ignorecount="0",locations=[
{locid="1",function="foo()",enabled="1",resolved="0",valid="1",ignorecount="0",
file="F:\Projects\test\main.cpp",line="5",addr="4199979"},],
file="F:\Projects\test\main.cpp",line="5"}@

When parsed as GdbMi value, the strings are expected to be escaped.

Change-Id: Idb923516c1cf6e25b970ad08fae977bdf1045b4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 07:39:50 +00:00
Marco Bubke
bfd8be99be UnitTests: Fix unit test build
Guard clang include.

Change-Id: Ia72b40fa787918f47508049b045a21edf976d93a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-03 07:32:18 +00:00
Aleksei German
d6da7745fa QmlDesigner: Remove old properties
Removed and replaced old properties for ListView and GridView

Change-Id: Ifbf2aae2958c5f67616d8f6a4acad6646b34c18c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-03 06:51:48 +00:00
Christian Stenger
5355aa7a37 Unittest: Fix crash in Linux
Change-Id: I1e8dc10bd9f0f9d11b0f18716e284ffadef7c6c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-03 04:21:00 +00:00
Orgad Shaneh
a408bcfd3d Clang: Add conditions for adding exceptions flag
For GCC it can be deduced from the compiler flags, so no correction is
needed.

For MSVC it can be deduced from the detected defines.

Amends 26693e8212.

Change-Id: Ie4850f328a2afdb3e5158c58f8c30a2644d9c592
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-02 15:26:19 +00:00
Henning Gruendl
6d51955451 QmlDesigner: Fix mobile scroll wizard template
Change-Id: I00d0467ce4ed28d0135e16c6ae9802ed66a1ff7d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 14:00:34 +00:00
hjk
fc1fc6a07a Qmake: Inline QmakeBuildStepWidget
That's mostly mechanical, except the summary updating part, which
was triggered rather extensively before and is now split into the
actual summary update, and updates related to abi list changes.

Change-Id: I1b691327fcc1d2437d96e893e910a1c65e321506
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-02 12:40:47 +00:00
Leena Miettinen
32dfddbf78 Doc: Stop QDoc from automatically generating a broken link
Fixes: QDS-2714
Change-Id: I9ae35a4a7436c743e448c0167c21f1080b8afe79
Reviewed-by: Asmo Saarela <asmo.saarela@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-02 11:47:30 +00:00
Thomas Hartmann
831a709857 QmlDesigner: Add support for .hdr to UrlChooser
Task-number: QDS-2128
Change-Id: I944a42d36357cbddae6d5cc30178723e62e0656f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:35:05 +00:00
Thomas Hartmann
49902aecd3 QmlDesigner: Add support for .hdr images
Task-number: QDS-2128
Change-Id: I840d808adb68a7439c0d1ea06f71e20ad53c00e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:29:18 +00:00
Thomas Hartmann
8259c1e0e7 QmlDesigner: Disable FlowTags for MCU
Change-Id: I708dad46d92c48991a603819313ce148eccc3b54
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:02:33 +00:00
hjk
f450c369a3 iOS: Remove redundant IosBuildStep::m_clean
This was determined and fixed at step creation time. There is
also no way a step can morph its "cleanliness", so there's no
need to persist that either.

Change-Id: I4c49aaee2cf00b6d428a8e4a213f1f072a01f57b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-02 09:57:27 +00:00
Leena Miettinen
de38744bba Doc: Update topic on using Border Image to create buttons
Change-Id: Iaea732121a5dfbad9f5791efd47f947d0c0e6045
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 08:35:54 +00:00
Ville Voutilainen
fdedd9570b Android: Don't require arguments for a service
Task-number: QTCREATORBUG-24557
Change-Id: Ifc1c9c5c2fcfaba48e043e4334fb019efa611f39
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-02 07:27:32 +00:00
Leena Miettinen
ed4704e0b4 Doc: Describe creating custom effects and materials
...using Qt Quick 3D custom shader utilities and commands

Fixes: QDS-2613
Change-Id: I5807c1617d2b54b3fba183c1278ec1266f899c70
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-02 07:17:50 +00:00
hjk
912fd4a1b3 iOS: Inline IosBuildStepConfigWidget
Also clean #includes.

Change-Id: I105edb5f0505545a371db6944831a96b3e8db698
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-02 06:30:22 +00:00
Leena Miettinen
2c36c737b7 Doc: Use \MinGW to prevent broken automatically generated links
Change-Id: Ib576e3be1035448905cc8c5bf23960450cf10057
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-02 06:18:29 +00:00
Christian Stenger
b42f1bd764 Nim: Remove unused declaration
The implementation is gone for a while.

Change-Id: I79e79569b24b7af5ca5e3df0a245fa5dd0f8ef30
Reviewed-by: hjk <hjk@qt.io>
2020-09-02 06:01:34 +00:00
Christian Stenger
17e0c2b044 Nim: Fix building with nimble
Do not expect nimble to be in PATH, but assume it is
located where nim resides. Use kit's information of
nim to construct the nimble path and add the path of
nim explicitly to the build environment as nimble
uses it.
Also fixes running nimble test.

Change-Id: If7be425f7b811486afe39fc1618709dbb2f75ac9
Reviewed-by: hjk <hjk@qt.io>
2020-09-02 06:01:27 +00:00
Sergey Belyashov
53a4d357bf Update Russian translation
Change-Id: Ifdbd70b4f225f8d64d408c9bed695f7e98b81eaf
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Olesya Gerasimenko <gammaray@basealt.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2020-09-02 03:23:10 +00:00
Aleksei German
84280f0410 QmlDesigner: Compact option for label deactivation
Change-Id: Ie163f4c021212837b703d2615cbf78b953e056ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 18:22:34 +00:00
Thomas Hartmann
ca88afbe31 QmlDesigner: Update complete scene
This removes painting artefacts, since
the bounding rectangle also gets smaller when updated.

Change-Id: Ic184cadbd1dbda1952012b749eadfde0da57ef7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:49:59 +00:00
Vikas Pachdha
1b19ae28db AssetExport: Do not export states, timeline and connection nodes
Nodes of type QtQuick.Item should only be exported

Task-number: QDS-2667
Change-Id: I099b2d1d2a14ded5de46c2852306d5825a89034a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:17:57 +00:00
Vikas Pachdha
727f25fbd6 AssetExport: Fix incorrect Node lineage
Task-number: QDS-2667
Change-Id: I50bd4fbd093734d2df35fce8aed57af28469d358
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:17:44 +00:00
Johanna Vanhatapio
980ba0d83d Doc: Describe custom shader utilities
Using the utilities will be described in another change.

Task-number: QDS-2613
Change-Id: I41ca69f84df6e977e41ff30508c8a77d779e1c01
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-01 14:27:35 +00:00
Aleksei German
dcefa9cd43 QmlDesigner: Change CoffeeMachine startup file
Task: QDS-2690

Change-Id: I7ab7a596bf940903c3feb3fbff5324fbd64f16bf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:57:05 +00:00
Mahmoud Badri
88e5a6200b QmlDesigner: Make active3dScene internal (not saveable)
Task-number: QDS-2699
Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:55:29 +00:00
Thomas Hartmann
c46ca844fc QmlDesigner: Fix for macOS issue
Task-number: QDS-2708
Change-Id: If7a2f850b9ada74f590574214f7bd1384e3f67e0
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:53:59 +00:00
Miikka Heikkinen
893d5901a6 QmlPuppet: Fall back to primitive creation if component creation fails
This ensures components defined in .qml files get loaded properly.

Change-Id: I070132ab5ad58b2531f27f623f218e0ee3565c5b
Fixes: QDS-2697
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:47:53 +00:00
Alessandro Portale
bbbb7d421b McuSupport: Use platform specific case for referencing "Path" value
... in the build environment of the generated Kit.

Change-Id: Ia0b8f8dba03a9a91c8435a3b2a4a1410f3459da8
Reviewed-by: hjk <hjk@qt.io>
2020-09-01 11:23:54 +00:00
Alessandro Portale
4e1434d51a McuSupport: Grant kits a Qt version on non Windows host
The qul libraries for the Desktop Backend are statically linked against
Qt on Windows. Also, the qul host tools are shipped with the Qt runtime
libraries (on Windows).

Not so on Linux, so a Qt version is required, there.

Change-Id: Id49ed2ef01926abc71291751eae03263317a56d4
Reviewed-by: hjk <hjk@qt.io>
2020-09-01 11:23:48 +00:00
Vikas Pachdha
4473769bc4 AssetExport: Notify QML parsing errors
QML can not be exported if the document have parsing errors

Task-number: QDS-2667
Change-Id: I22075789cfa5853b1607c45e2b49bb761836c0d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-01 11:07:16 +00:00
Aleksei German
f43b81ae6f QmlDesigner: Disable Properties unavailable in QUL
Disabling properties in:
 MouseArea
 Flickable
 Image
 Text (including Font)

Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 10:03:53 +00:00