Commit Graph

5036 Commits

Author SHA1 Message Date
Christian Stenger
28ab852e53 Squish: Wait for a clean shutdown when restarting QC
This fixes a race condition in tst_CSUP06 where the next run
of QC removed .user* but the first instance was not completely
finished with the shutdown process. The .user files of the project
got updated (or recreated) before the second instance tried to
open the same project again. Ensure the first instance is closed
to be sure that project's .user files got created or updated
before the second instance tries to remove and re-open them.
Follow the same approach for other tests to avoid the same issue
later on.

Change-Id: I37721f4dd647f9bbf7c6fed6e753a2906e30db81
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-07 12:48:28 +00:00
Robert Loehning
1a64efd863 Squish: Stabilize tst_CSUP06
Change-Id: I2cac53f69d15763770fe3955408867ec668bfccd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-07 11:12:29 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-05 09:24:18 +00:00
Ulf Hermann
67b09f5132 Tracing: Adapt aggregator test to new ctor signature
Change-Id: Ifb94c1e1f14b26aa2bb365cd08d36fa67642ecc7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-31 08:14:04 +00:00
Christian Stenger
09b611acde Squish: Fix checking for plugin loader issues
Change-Id: Ibf894f3792f78c496be5fcbdfcd6c19b8b1246e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-30 11:01:43 +00:00
Christian Kandeler
faccb8fd71 qbs build: Fix highlighter engine autotest
We link against the TextEditor plugin as of 601eebd832, so don't pretend
anymore that we are the plugin.

Change-Id: I8afdce57ceffdcbf965e16e7a24c0a9ab6d7d234
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-28 13:06:32 +00:00
Eike Ziller
601eebd832 Fix painting of current line in generic and python editors
The generic highlighter and the python editor explicitly map some tokens
to the format C_TEXT. Unfortunately this format is special, because it's
foreground and background colors are handled by setting the editor's
palette, and should not be used for setting the format on characters.

If the format is explicitly set on characters, their background will be
oblique and overpaint e.g. the highlight for the current line, which
looks pretty ugly.

Handle this directly in SyntaxHighlighter::formatForCategory for all
syntax highlighters, by returning an empty QTextCharFormat for C_TEXT.

Change-Id: Ifaeb556754ca8106ad6e55d7062b13b45457a809
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-08-24 08:15:21 +00:00
Robert Loehning
bba35ceff4 Squish: Remove remaining mentions of Squish hooking
Change-Id: If4fde6d47433b1c8e46c68c5b225004446214797
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-23 12:11:36 +00:00
Robert Loehning
fe8c8619c9 Squish: Update URLs to sources of Qt 4.8.7
Change-Id: I9dfc2df788be128ee82561d1974920c5924566e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-22 11:27:12 +00:00
Robert Loehning
21bcc7f38b Squish: Use sets instead of lists for kits in use
They fit our use-case much better.

Task-number: QTCREATORBUG-20874
Change-Id: Ifa06ce00f3e6999a99c3bc2bb7e9ba759fa02e94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-17 12:58:14 +00:00
Orgad Shaneh
44776760ba Tests: Add #include <QtGlobal> for version checks
It is required with Qt 5.11.

Change-Id: Ie6aee4a5d71a370952f908561a40ccc2d34d31c5
Reviewed-by: hjk <hjk@qt.io>
2018-08-16 08:29:36 +00:00
Orgad Shaneh
98b6fd26bf Dumper: Fix enum display in nested types
When used in SubItem, enums were displayed as
"value of type E at address <addr>".

Change-Id: Ieecfb791126c6f63f272817afc6c8d05f28b9242
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-08-16 06:42:21 +00:00
Robert Loehning
24f33dc482 Squish: Update Creator's sources to v4.7.0
Task-number: QTCREATORBUG-20344
Change-Id: I7664f2f1b9f9412b9564f192319f9ed832dc142a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-14 10:04:10 +00:00
Christian Stenger
8c1a2eb2c0 Squish: Fix passing argument to helper function
The code of the helper function has changed and what worked
before by pure coincidence now fell apart.
Passing a list to a function that tries to use it as a key
for a dict results in an exception as lists are not hashable.

The code is likely to change by adding a newer kit. This patch
just makes the current state work without crashing instead of
adding functionality that is not yet used.
Amends aed1616b35.

Change-Id: I6e8a6490988700de14596ba981b5e6900133a79d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-10 10:39:47 +00:00
Robert Loehning
94fb8efab1 Squish: Remove old default target parameters
Change-Id: I72153c535ae0670cb4bfa061f34659bc7faee001
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-10 09:35:17 +00:00
Robert Loehning
59f124eb07 Squish: Fix checking for Profile mode
Amends 2a274728c2.

Change-Id: Id686e031658ad737eaeeffabe857452cc8a0d7ac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-09 10:47:18 +00:00
Robert Loehning
aed1616b35 Squish: Simplify mapping between kits and their names
Task-number: QTCREATORBUG-20861
Change-Id: I809036dc331b93f015ee5b10381229b106e27cbd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-09 09:08:42 +00:00
Robert Loehning
2a274728c2 Squish: Also check for "Profile" config being checked
Change-Id: I9f6598144b81240c4a92abb7e71b7c4cbf6baa4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-07 09:25:22 +00:00
Robert Loehning
2c6a57be9c Squish: Move imports of "os", "re" and "sys" into shared class
Change-Id: I349cb255b8fa6f96e32d5dacb3c9b58ddeb76897
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-07 09:25:05 +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
da21353276 Squish: Don't explicitly pass default to createNewQtQuickApplication
Change-Id: I006c6cad0e972006475ad488b9a71def09de0dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-02 11:48:37 +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
Christian Stenger
01aafd8021 Squish: Redo readFile()
Change-Id: Ife8f951aa8fc86403197318b55db725ed3259336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-01 05:33:24 +00:00
Robert Loehning
6d7eb57e75 Squish: Test pasting with pastebin.com
Yes, there are only ten pastes per IP per day. But doesn't that mean that
nobody can rely on it being availabe anyway? So it's better to use some
of those ten pastes for testing instead of not testing pasting at all.

Change-Id: I45362e5ab0c3eb43f1ddd18d4be39474e26c8460
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-31 10:02:18 +00:00
Robert Loehning
8c0042da40 Squish: Use sections for services in tst_codepasting
Change-Id: If97331e3a18f44ca82ad81c7609dc3162caf5254
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-31 10:01:51 +00:00
Robert Loehning
7cc5376f0d Squish: Fix handling of server issues in tst_codepasting
Change-Id: I35d8dbeb11be104a1af2956125a29c4606c7e050
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-30 13:04:31 +00:00
Christian Stenger
3f97874ca1 Squish: Fix tests after revert
The patch that removed Qt4 completely from the widget app wizard
has been reverted.
Adjusting the tests now.

Change-Id: I0af1eb2102caa22022658d1189794c7757c7628f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-07-27 08:40:08 +00:00
Robert Loehning
210a873efb Squish: Forward qbs' warnings about deprecated features
Change-Id: Ib99713b95d010acf4b49065ad7e20862e59476d1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-26 13:05:06 +00:00
Robert Loehning
69f75036ab Squish: Remove unneeded function call
Change-Id: I3fb85bc69086501dada922b45ef353e34030e0db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-12 14:31:34 +00:00
Robert Loehning
7e3cdbe548 Squish: Remove unused variables
Change-Id: I24d8ecbe7e7208a20d0f27f62d5b8f488d2a240a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-12 14:31:18 +00:00
Robert Loehning
e0f8779168 Squish: Update suite_WELP
This is a follow-up to 744279.

Change-Id: I24485972b3a292952c653f2cfab1af198578fcc4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-11 09:25:15 +00:00
Robert Loehning
3bf887c2ad Squish: Update tst_CSUP01
The built-in code model also proposes "void_t".

Change-Id: I2462e47d5b1a69065f998244fc8372011e37a0c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-09 09:53:55 +00:00
Robert Loehning
6a42d8bd74 Squish: Give code model more time to list refactorings
Change-Id: I944dfa306954cd16fdb24334db6e869702da282f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-09 09:53:44 +00:00
Robert Loehning
417a6db087 Tests: Add lines for testing editing and output of int
Change-Id: If31b5957fa55f5dd31205a0b4495491314fa87c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-03 09:22:08 +00:00
Robert Loehning
9e6fe45ad9 Squish: Fix for Qt 5.11
The items in the treeView look slightly different than
with Qt 5.10 and thus seem to lose the mouseclicks.

Change-Id: Ibee1abdbc9e9bfe622b45f76ed5e612e81fd1770
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-02 09:10:58 +00:00
Christian Stenger
2801372d46 Squish: Fix expected targets for widget app wizard
Reverts cd45ce5f39.

Change-Id: I6865e6c91fd961ac36da160a01c676f5274c40cc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-29 05:17:55 +00:00
Christian Stenger
3f54c55e58 Squish: Handle more server side issues
If we get correct http responses that point to server side
issues handle them appropriate if possible to let the test
continue instead of crash.

Change-Id: I7d2e8848269600762e9c7fe980414c4f7106433c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-29 05:16:30 +00:00
Christian Stenger
cd45ce5f39 Squish: Remove Qt4 from expected kits for widget application wizard
Change-Id: I747b47a5adb684f9ef3c245427707ead9ffba20a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-26 14:21:19 +00:00
Christian Stenger
922c73ad67 Squish: Add VS2017 as expected compiler on Windows
Change-Id: If68d6a143f4c1f9b96fe7c561977ab481a31ecb4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-26 13:20:37 +00:00
Christian Stenger
dfdfff2148 Squish: Fix expected string
Capitalization has changed.

Change-Id: Icbfa295beab27c1cfb2ec1ae6198784f134563a6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-22 10:50:17 +00:00
Robert Loehning
7a14654a2a Squish: Remove workaround for fixed bug
Task-number: QTCREATORBUG-20057
Change-Id: Id308fed4ec83c7aa89b822f00174a1e9ed2a0764
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-19 12:48:20 +00:00
Ulf Hermann
5f9f8f9f16 Tracing: Handle mouse events in FlameGraph QQuickItem
Having an additional MouseArea as child of a ScrollView or a Flickable
is not well defined and leads to inconsistent behavior on different
systems. We can easily catch the relevant events in the FlameGraph item
itself. Also, don't redirect the typeSelected() signals through the
model. They don't belong there.

Change-Id: I77c17977b5a51d57ccd2ef880d3d6c6a604b7f78
Task-number: QTCREATORBUG-20573
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-18 12:35:36 +00:00
Ivan Donchevskii
e1111d4570 Clang: Use built-in follow symbol for virtual methods
ClangCodeModel currently does not provide a list of overrides.
Therefore it makes sense to use ClangCodeModel result for
virtual method only if built-in code model does not find anything.

Task-number: QTCREATORBUG-20584
Change-Id: I5b4fac7974f990e741d3438ab61827670a8ce8d8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-15 12:15:22 +00:00
Orgad Shaneh
18edce07aa UnitTest: Fix build
This amends commit c62daf9cda.

Change-Id: Ia1d574f788f97a3d0bb3a7c6724659c2875e2c81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-12 05:42:19 +00:00
Nikolai Kosjar
cbd4d05423 Clang: Fix processing documents if multiple are opened at once
Reproducable with
 1. $ ./qtcreator a.cpp b.cpp
 2. Switch to a.cpp => no highlighting

Because ClangEditorDocumentProcessor does asynchronous processing, the
backend might receive a DocumentsOpenedMessage where the document is not
the current editor (happens for a.cpp in the example). When switching to
that document, the initial jobs were not processed as the document was
not dirty.

Address this case by also checking for documents that have a revision of
1 and are not dirty. Unify adding the annotations jobs to ensure that
not more than needed are run.

Change-Id: I14030260842f97d58280235e763c8d7490705f8d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-08 06:32:40 +00:00
Robert Loehning
c91dde79d5 Squish: Update object for tst_HELP05
Change-Id: I0a38ed35061000591b8078ef534c2996809aeb58
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 05:29:20 +00:00
Robert Loehning
9cb1700993 Squish: Use built-in code model in tst_APTW01
The warnings from ClangCodeModel confuse our build check.

Change-Id: Ic6b82bb304387f447bdf8eb0b2fd02dd2f250fb2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-05 09:08:47 +00:00
Robert Loehning
35eabd7d40 Squish: Explicitly disable ClangCodeModel for testing built-in
The ClangCodeModel is the default now.

Change-Id: Id432cc9d27dcf7327c0b7efeba7004521d25fee5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-05 09:08:20 +00:00
Robert Loehning
2fb270c77f Squish: Update tst_simple_analyze
Change-Id: I2cbe39a225760f53d70487e105e2b45fd4e16d33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-04 11:24:10 +00:00
Robert Loehning
149a77a01d Squish: Handle third kit state
Change-Id: I3442cf7676b7f316a60344b9c7dfc2d777529785
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-04 11:23:51 +00:00