feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
75,631 Commits 108 Branches 368 Tags
5d55cfdae5e37c9d39b23a261b2569c91db6d5d5
Commit Graph

59 Commits

Author SHA1 Message Date
Eike Ziller
5d55cfdae5 Merge remote-tracking branch 'origin/8.0' 
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
	src/libs/utils/fileutils.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/nodemetainfo.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/remotelinux/linuxdevice.cpp
	tests/auto/utils/fileutils/tst_fileutils.cpp

Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
 2022-09-19 09:54:06 +02:00
Robert Löhning
a35ebe2753 Squish: Update and improve isMsvcConfig() 
Change-Id: Icff3a8178e89623097e2da7ff8f1e72197f1a4dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-09-16 08:09:53 +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
Christian Stenger
de1a328390 Squish: Fix debugging console app test 
Change-Id: I752dab65948952081752a805018cfc3b01193855
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-18 14:39:49 +00:00
Christian Stenger
f43348c4f2 Squish: More corrections due to change of default build system 
Change-Id: Ia221e1e84784f5218d14258fcc24dcac900d60ad
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-16 12:56:43 +00:00
Christian Stenger
d24f13d66d Squish: Adapt to changes ui text 
Change-Id: I03187ddecb7a5737a87a626135584458795aa633
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-16 05:18:18 +00:00
Robert Löhning
939fb7cb0c Squish: Fix storing breakpoint locations on Windows 
Not changing Linux or Mac.

Change-Id: Idcc22c9d960ced7145b10651f75c78a740714cff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-08-19 11:15:00 +00:00
Christian Stenger
bfe2a7b9d1 Squish: Fix suite_debugger 
Change-Id: Ic0add36d2acfbf4c6de93d27f8651062ad9f1fb4
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2021-08-10 18:55:43 +00:00
Robert Löhning
2f6c5db856 Squish: Update isMsvcConfig 
Change-Id: Ia2042d32d0a41a8876ba6dfae960f48bca2b298c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-08-06 09:29:17 +00:00
Robert Löhning
8d813b8864 Squish: Remember where breakpoints are 
So we don't have to update the test each time
Creator changes the project templates.

Change-Id: I76f96f719895f2f8cadccaf9c91cc85d1735ce13
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-04-23 09:45:06 +00:00
Robert Löhning
aaa5b93b2e Squish: Simplify API of doSimpleDebugging() 
No need to pass a value which never differed from len(...)

Change-Id: Iea481abed0ebfa9acf05456bc2ff1f01c7bc0d1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-04-21 17:27:31 +00:00
Robert Loehning
cc63b3b47a Squish: Update menu items 
Change-Id: Ibbca07fb02092ce829246e99b2365b513b1fa4e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-07-02 11:15:13 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects 
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2019-07-25 12:06:05 +00:00
Alessandro Portale
5311708845 python scripts: Use "not in" operator to test membership 
As per suggestion from Pyls, this changes
  if not needle in haystack:
to
  if needle not in haystack:

Change-Id: I4a482604e13e61ecee9e02935479632419710ff7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2019-05-10 05:53:39 +00:00
Christian Stenger
326adef0de Squish: Further adaption to UI changes of debugger 
Change-Id: I0e28d2f929c7a69aa61313e3e5473143dc88e5b1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-10-16 12:07:24 +00:00
Christian Stenger
885be5524c Squish: Adapt to changed UI of debugger 
Change-Id: I234ec55f69751f9fc9c543956fe5b9f058ef9633
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-10-16 10:40:41 +00:00
Robert Loehning
ff10f8c3a5 Squish: Fix warnings 
Warnings from static code checks, that is, not test.warning() at runtime.

Change-Id: I651d13491106583908059ecdb5f700f539b6d9c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-06 14:21:30 +00:00
Robert Loehning
e8acb75115 Squish: Refactor selecting configured Kits in project 
The design of the Projects mode changed several times. We wrote lots of
workarounds to keep even more old code alive because we never had the time
for a proper refactoring. This time is now.

Leads to more stable code with far less variables flying around.

Task-number: QTCREATORBUG-20265
Change-Id: I29e5956ea3279cdb1d6da61bf5b461666de436bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-02 11:48:14 +00:00
Robert Loehning
c5511de338 Squish: Remove hooking into subprocesses 
It worked well but the maintenance burden turned out to be too much.

Task-number: QTCREATORBUG-20055
Change-Id: Ic8663f808c50ca9fb17d52b6bc6c72baf7503358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-02 09:51:05 +00:00
Robert Loehning
ba1036fd46 Squish: Fix searching for filename in windowTitle 
Currently, only the end of a filename as actually
compared since the title also contains "filename.h"
when the title starts with "otherfilename.h"

Change-Id: I60dd4dc1fd7c53fee2ddbc44953bcfe4d75c7530
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-08-30 12:27:37 +00:00
Robert Loehning
11abd8edf7 Squish: Replace Qt4 SDK by self-built Qt 4.8.7 
Change-Id: If990367afb01aae94755930c02c81ae82b23bb8f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-31 14:04:00 +00:00
Robert Loehning
5b9450a3d3 Squish: Remove workaround for fixed bug in tst_simple_debug 
Change-Id: Iad0fd8fb2a591dce86ebc05fc0d32e828193e298
Task-number: QTCREATORBUG-17492
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-04-03 12:12:13 +00:00
Robert Loehning
262141a0dc Squish: Make workaround permanent in tst_simple_debug 
The fix is in 4.3

Task-number: QTCREATORBUG-17492
Change-Id: If155bd9b16a119e7b91161788708c21653222f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-20 15:06:34 +00:00
Robert Loehning
2a6c315fbb Squish: Workaround unexpected error message 
Task-number: QTCREATORBUG-17492
Change-Id: Icda68a756b3420baa494e90c41dbefc656ae6327
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-04 14:42:18 +00:00
Christian Stenger
c87d0d7b58 Squish: Stabilize test for removal of break points 
Change-Id: I1fdfc654e18a4cb219624b65e5d812faa479eb66
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-03 10:16:48 +00:00
Robert Loehning
25919d9020 Squish: Don't crash when missing breakpoint 
Change-Id: I8eba72baa043bebc8618fbfe51fa31d7215165e7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 11:11:54 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation 
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 16:01:06 +00:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Christian Stenger
7a86928fbc Squish: Fix getEditorForFileSuffix() and simpleFileName()... 
...when using filenames coming from Squish's treeview syntax.

Change-Id: I0296dbabb09af11dde5ed4716b1b1f48f05c47e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-04 15:12:50 +02:00
Robert Loehning
23e9338e97 Squish: Enable QML debugging in doSimpleDebugging() 
Change-Id: I46a902a8038beac49e70a8a1f422c079bd2b3f44
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 15:34:48 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Robert Loehning
6578a9ba9f Squish: Fix handleDebuggerWarnings() 
Change-Id: Ib4550e82e0acfa168003f64d91bf25af62a533fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-25 13:47:21 +02:00
Robert Loehning
01b3e1fa54 Squish: Fix __startDebugger__() 
Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-21 11:01:42 +02:00
Robert Loehning
648403d439 Squish: Fix handleDebuggerWarnings() 
Warning now shows up for MSVC builds, too.

Change-Id: I774079fd6ee0f9bf70a7f37c9920dd45e55154d0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 13:54:04 +02:00
Robert Loehning
e259196593 Squish: Update handleDebuggerWarnings() 
Change-Id: Ifd0a9270f84abe15603cbf80ef18eb7450436c74
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 14:58:50 +02:00
Robert Loehning
3b46f64272 Squish: Updated handleDebuggerWarnings() 
Change-Id: Id5129e6797b945c16ecafad92f0d00bd0edeb3cd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-28 12:10:32 +02:00
Christian Stenger
3590eed886 Squish: Clean up before and after Qml debugging 
Change-Id: I592842964984b51669b773a9af1fdd81df032f7b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:32:52 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Robert Loehning
f09ce82e23 Squish: Made tst_simple_debug more strict 
Change-Id: Iac438c8a55c8ea144c682257e140f9370e999e69
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:33 +01:00
Robert Loehning
b2ef08a5c0 Squish: Shortened verifyBreakPoint() 
Change-Id: I98ed094ec4a6ad2545ee804934fe1674c4b97d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:14 +01:00
Robert Loehning
7c9d2e3a1a Squish: Fix invoking context menu sub items 
Change-Id: I7d498ac3d4e2e2d25b3c504a95f96e434d0d1619
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-21 13:55:45 +01:00
Robert Loehning
6ebb71ab57 Squish: Fixed tst_simple_debug 
Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 14:27:27 +01:00
Robert Loehning
3f570a7901 Squish: Enable testing with MSVC again 
Change-Id: Ib6051caa6e3a52a611aa24c0bf0c4d89939fdd58
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-23 12:06:26 +01:00
Robert Loehning
77313fd980 Squish: Removed pointless explicit timeouts 
Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-05 12:59:07 +01:00
Robert Loehning
95af1cd4f8 Squish: Added helper functions for views and models 
Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-25 13:58:34 +02:00
Robert Loehning
e16eb7ea43 Removed unneeded and mistyped HTML 
Change-Id: I49f50fc213b88af478c1411933630eb705898c23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-09-11 08:19:33 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM 
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-06 09:42:38 +02:00
Robert Loehning
26c937e512 Squish: Don't wait for warning on Windows 
Currently, it's not being shown.

Task-number: QTCREATORBUG-7704

Change-Id: I3fbcce411b205c7ece30dc6de421b0a0a10b7ab3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-08-08 10:30:34 +02:00