Commit Graph

66382 Commits

Author SHA1 Message Date
Eike Ziller
781d54249e cmake build: add qtc_add_resources to API
Adapted from qt6_add_resources. Takes a list of files and compiles these
into a resource file.

Change-Id: I375aa17b76e283b90bc0cbe8b6859520bcac7da3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-27 06:45:52 +00:00
hjk
045881089f QmakeProject: Don't crash on project import
Amends fc1fc6a07a.

Fixes: QTCREATORBUG-24802
Change-Id: I62e7e0bab82ae1b025c053785b77586aa78bcd1f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-26 16:30:11 +00:00
Eike Ziller
20a6207459 cmake build: Disable clangpchmanagerbackend and refactoringbackend
By default. Previously only the corresponding plugins were disabled, but
not even building the backends makes more sense.

Change-Id: I36d61869a3050f37da1f480dea89e7539dda599a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-26 15:34:22 +00:00
Christian Kandeler
7e5ec83c1b Get qbs build closer to building with Qt 6
Change-Id: Idf96a03db3b3f1aa5af07fb59f261250d7787e61
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-26 15:25:10 +00:00
Christian Kandeler
a8a6a9e774 ProjectExplorer: Make project window state persistent
Task-number: QTCREATORBUG-24690
Change-Id: Ia261fc5a98681676e8d67e6d840f2f48073cdbb2
Reviewed-by: hjk <hjk@qt.io>
2020-10-26 13:54:04 +00:00
Cristian Adam
6c841dfbd0 GitHub Actions: Update to use Clang 11.0.0
Change-Id: I015a71a4f53ff3be8609a00bdef47c93161af882
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-26 12:47:46 +00:00
Henning Gruendl
2c65e2323c QmlDesigner: Fix delegateMargin not used warning
Change-Id: I981607f68cad9a55e3d8f4b43e33eb14db515c47
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 12:45:31 +00:00
Ivan Komissarov
e062f542dd Update Qbs submodule to the top of 1.17 branch
Change-Id: Ibcd9d1b05d66038e4a9071cedc5c236cd8edb649
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-26 11:46:25 +00:00
Assam Boudjelthia
1f9124c976 CMake: update project templates to work with Android for Qt 6
Qt 6 introduces qt_add_executable() function, which for Android
make sure to call few Android specific functions like:
* qt_android_generate_deployment_settings()
* qt_android_add_apk_target()
* qt_android_apply_arch_suffix()

Using add_library() only the user would otherwise need to reimplement
what's already implemented in add_qt_gui_executable().

Task-number: QTCREATORBUG-24681
Change-Id: Iec3984139844fe1cbac2d9a583b3c40bdaa308a0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-26 10:42:06 +00:00
Henning Gruendl
15db0bb173 QmlDesigner: Rework SpinBox dragging functionality
* Replace DragHandler with MouseArea due to the DragHandler not being
  able to accept MouseEvents
* Replace TapHandler with MouseArea due to MouseArea stealing press
  signals from TapHandler, but needed to get press events due to
  removal of DragHandler
* Add functionality to keep cursor in place while dragging
* Keep ActionIndicator visible while dragging
* Fix qsTr in RectangleSpecifics

Change-Id: I6558623287e1864359128d4194c9db78736ee3a4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:47 +00:00
Henning Gruendl
fcb3fabd13 QmlDesigner: Update look and feel of navigator
Task-number: QDS-2880
Change-Id: I5e54e6c35afe8bd0149f35486ac308ce0ea0d59a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:35 +00:00
Marco Bubke
553929f322 QmlDesigner: Ensure that cache directory exists
We write data to the cache directory and it is easier to ensure it at
the initialization of the plugin than in multiple different places.

Change-Id: I2b6e5d607e1b28b13ee4968842d21d4dad7aaf15
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:51:56 +00:00
Mahmoud Badri
98d7b5b6e5 QmlDesigner: Optimize deleting nodes
- remove unnecessary call to directSubModelNodes()
- replace foreach with for (avoid unnecessary copies)

Change-Id: I42721a4c4e69f320664af8364f8baa0df0d11459
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:38:11 +00:00
Mahmoud Badri
4a3bd72db8 QmlDesigner: Fix duplicate locked item entries
Fix: When selecting more than 1 ancestor of a locked item and pressing
Delete, the locked item will appear duplicate in the warning message
box as many times as the number of selected ancestors.

Change-Id: I72c5e35edb2974da3d630a87e236b58e0d7e8ab3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:37:53 +00:00
Christian Kandeler
cc4bd3b738 TextEditor: Add "F1" hint to tooltip if and only if help is available
Note that this does not have performance implications, as we already
call HelpItem::isValid() in the same code path.

Fixes: QTCREATORBUG-24782
Change-Id: I8495099c97233e4df4b8d2a30579fb6324122e92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-26 09:15:48 +00:00
Eike Ziller
5e67bc5055 Fix build with Qt6
Add missing includes for "incomplete type" issues.
Remove usage of QDesktopWidget.
Don't compile native WebKit help backend (missing native widget integration).
Add SvgWidget dependency.

Task-number: QTCREATORBUG-24098
Change-Id: I1b3afb54d385940ff283824870fa7454866212a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-26 08:44:21 +00:00
Assam Boudjelthia
62e84f129a Android: fix "uninstall app first" checkbox placement
Change-Id: I2f79e9a5c344e5364fa377422f682f8e0c2927e2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-26 07:13:30 +00:00
David Schulz
859d2edbb5 TextEditor: Always destroy old context when displaying new proposal
This makes sure that the old proposal widget is disconnected from the
finalizeProposal slot and thus prevents resetting the currently shown
proposal.

Change-Id: I80d58d9a04831d464bea69697568359990ac5260
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-26 05:00:49 +00:00
Kai Koehne
4d8cd5fa03 Welcome screen: Add "Get Qt" link
Change-Id: Ic3a6210a0b1600ae308bbdb43f0c50fc72d910e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-25 08:47:07 +00:00
Ivan Komissarov
28b09227e4 Update Qbs submodule to the top of 1.17 branch
Change-Id: I9551c70eaa1b5f2c3f9413f90c8c1d7b7394622f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-23 13:52:47 +00:00
Christian Kandeler
916db8e781 Utils: Use std::stable_sort() in Utils::sort()
Potentially makes for a more consistent user experience, and does fix
some CppTools test failures on macOS.

Change-Id: I5bfd7a2460248450ad92259956598532fb7fb8ee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-23 12:11:39 +00:00
Vikas Pachdha
8848eb7d7e AssetExport: Use QFontInfo for font properties
Task-number: QDS-2867
Change-Id: I7a5d622f4f43cc8a73e29950616595a314bb6ffc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-23 12:01:21 +00:00
Thomas Hartmann
28022d8e04 QmlDesigner: Remove Quick3D dependencies from ModelNode2DImageView.qml
Change-Id: Idf19019dbeebf8f3f09309a724727a4aa643ce25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-23 10:58:58 +00:00
Mahmoud Badri
2bf40dddfd QmlDesigner: Fix copy / paste bug
Fix a bug in calculating the scatter value when pasting an object. Also
some tweaks and clean ups in the same file.

Fixes: QDS-2982
Change-Id: Ic2847d03ccf03d188c5fbca2cd14bc74b9d20223
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-23 08:40:41 +00:00
Christian Kandeler
8d8473daf6 Debugger: Fix compiler warning in dumper test
Change-Id: I9f3633065890bb5e574fd688b39b0bc93a94c8b1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-23 07:22:50 +00:00
Christian Kandeler
c9c0e80339 Qmake: Fix wildcard expansion for absolute paths
Wildcard expansion for e.g. deployment purposes was implemented, but
accidentally only for relative file paths.
Amends 9e32603c3d.

Fixes: QTCREATORBUG-24695
Change-Id: Iab5c761ad68c2d4facecef5b44e6e50e66ed4941
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-23 07:22:04 +00:00
Christian Kandeler
c2913f65e4 QbsProjectManager: Do not cache incomplete environment
Retrieving the run environment for a qbs product can fail if the qbs
session is busy at the time of the call. In such a case, caching the
result will cause subsequent accesses to retrieve an incomplete
environment. This patch fixes the latter problem.

Task-number: QTCREATORBUG-24599
Change-Id: Ia0c6831cf371995ac8399d15e4dd93b8bb6e4f3b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-23 07:21:25 +00:00
Thomas Hartmann
98a649ccfd Fix crash for missing BuildSystem
There is no gurantee that a Target has a BuildSystem.
Target::additionalData() does expect a BuildSystem.

Task-number: QTCREATORBUG-24817
Change-Id: I41edf89fa6dbf6ed24a27129b8353a9506b7b176
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 13:34:09 +00:00
Orgad Shaneh
b1cd859219 VcsManager: Fix adding files to VCS from locator
The files are listed by file name without path, so git add was executed
from the user's working directory instead of the target directory.

Amends commit 48c56416f5.

Change-Id: Iba7c5ff33378265d3c22479d7abb6ccf8db75d07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-22 12:59:01 +00:00
Robert Loehning
89d36b418a Make Help mode Squish-testable again
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-22 12:44:54 +00:00
Eike Ziller
c510cf79d8 cmake build: Add option for exporting plugins
That can be used for external plugins. Just add the option "EXPORT" to
your "add_qtc_plugin(MyPlugin ...." call. Other plugins can then do
"find_package(QtCreatorMyPlugin)" and link against
"QtCreator::MyPlugin".

Supports both using a Devel install or using a build directory of the
plugin that is depended on.

Task-number: QTCREATORBUG-22803
Change-Id: I80724eca8c828d2d5be307d32f3125c4e3bd8b3a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:45:12 +00:00
Eike Ziller
e83e146d08 cmake build: Install our special FindQt5.cmake
Which handles the Qt5 vs Qt6 differences

Change-Id: Ie2e4d1c9564cd1d88c912b23c08a721e9e4e1b90
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:45:06 +00:00
Eike Ziller
067cb61c7c cmake build: Fix export name in case of branding
We must use the same name everywhere for the export name, for simplicity
stay with QtCreator, since this is not user-visible anyhow.

Change-Id: I4f51982534662d46401dad1320eec3758eed055b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:44:58 +00:00
Christian Stenger
860eeca6c5 QMakePM: Restore old system() handling to old behavior
Parsing qmake based projects without execution of system()
may lead to inexact parse result and can end up with unusable
projects.
Amends dd62254.

Change-Id: I7300a810c82959aab159d2492b4020998d26de38
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 08:27:17 +00:00
Henning Gruendl
73a26c0039 QmlDesigner: Update icon font
* Add pin and unpin icons

Change-Id: I42773d3f86f68d9bc638fa27500fb0b1b4e5d35d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-22 06:46:57 +00:00
Cristian Adam
ee735e308e GitHub Actions: Set timeout for running tests
Timeout of 5s for tests that do not have the TIMEOUT property,
and 600s for the whole teset suite.

Change-Id: Ie58f1ec2f657448a963bf51d6e93cad142603120
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-21 20:51:28 +00:00
Cristian Adam
79ed00e14d Update Qbs to HEAD of master
Fixes issues when installing via cmake --install

Change-Id: Ia4eb1ebabbdba24f15367710011da8400cd9706a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-21 17:33:56 +00:00
David Schulz
3b611e07f7 Debugger: prevent calling functions with gdb on windows
and adjust tests accordingly

Change-Id: I172e08cfccc248eea06a94208c9e8e312d69e334
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 11:15:40 +00:00
Christian Stenger
c9d2a8d69e AutoTest: Support QTest::addRow as well
Fixes: QTCREATORBUG-24777
Change-Id: I33ac86a226036855a304b71e2e7ebfe8884d8dc3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-21 10:16:04 +00:00
Christian Kandeler
b58ca33ff6 CppTools: Categorize the delete operator as a write access
... in the "Find Usages" results.

Change-Id: Ib399bf762c717b7d4439be26b9180574aefce7e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 09:12:33 +00:00
Christian Kandeler
135e76f965 CppEditor: Offer InsertDefsOperation quickfix for all classes
The check whether there are unimplemented member functions takes quite
long, so Creator would freeze for several seconds when right-clicking on
the name of even a medium-sized class.
Therefore, we offer the operation for all classes with member functions
and move the expensive check into the perform() method.

Change-Id: Ie19958ba8c53493be859f9982d7d5697e6e9d88b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 08:19:25 +00:00
Christian Kandeler
ed292f3f9b clangbackend: Categorize non-const pointer arguments as output arguments
Fixes: QTCREATORBUG-24550
Change-Id: Iac4f3b133a632d7272bfe4253f8a0740e51b0952
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 08:08:29 +00:00
Christian Stenger
cbf4e8af0a QmlPuppet: Fix qbs build
Amends 6b8d8e4.

Change-Id: I1bac4049478b87e12d7e0ea16d5e7450745c2952
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-21 08:05:42 +00:00
Eike Ziller
cc6f35016a Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I6aa2cb51dcbb4d76238a2ed8603bf57a35ee4fd6
2020-10-21 09:10:50 +02:00
David Schulz
0ca9ea353c Editor: Do not use disabled code color for right margin highlight
Fixes: QTCREATORBUG-17174
Change-Id: I68729d5a44b23fe46b810054a1dc472ffd63e272
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 04:32:27 +00:00
Miikka Heikkinen
6b8d8e414a QmlDesigner: Port 3D edit view to Qt6
Task-number: QDS-2899
Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 14:55:43 +00:00
Eike Ziller
49a8266d58 Update Qbs to HEAD of master
Fixes issues when compiling with ccache.

Change-Id: I3cb712b84f527eaf35649d207d5750fa698d46b7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-20 14:47:54 +00:00
Cristian Adam
3c4f7967e3 CMake Build: Allow building unittests when targets are missing
when configuring a minimal build make sure that when querying
for target properties like SOURCE_DIR the target actually exists.

Change-Id: Ib754b79be6461e3ddd4cdeb1abac123cf4535068
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 14:12:54 +00:00
Cristian Adam
a2aa02acba CMake Build: Make sure testplugin target exists before setting property
When doing a minimal build, the testplugin might not be created.

Change-Id: Ia4f1cbd14cbdad6e81cb7090a7f52aad692175fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 14:12:38 +00:00
Christian Kandeler
2b5e1ea62e CppEditor: Fix some "convert to camel case" edge cases
Fixes: QTCREATORBUG-16560
Change-Id: I8573ae6c5dce0956c868addc69a921c62f1d571a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 13:27:54 +00:00