Commit Graph

4400 Commits

Author SHA1 Message Date
Robert Loehning
bde4362dad Squish: Replace Qt 5.2.1 kit with Qt 5.6.1
Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-27 10:07:14 +00:00
Robert Loehning
84f84890fd Squish: Use shadow builds in tst_debug_empty_main
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Idb248e86dbe904e2f3867d793b80119f7e2dc31c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-27 10:03:05 +00:00
hjk
53415cece1 Utils: Streamline TreeModel API
The LeveledTreeModel case is general enough to cover
the UniformTreeModel case, so merge them and rename to
TreeModel. The former TreeModel is now BaseTreeModel.

BaseTreeModels should not be instantiated directly,
a tree model with non-uniform basic items is available
as TreeModel<>.

Done-with: Eike Ziller <eike.ziller@qt.io>
Change-Id: I64a65617ab68c0cde39cf65f4bc092ef808ee6fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-27 08:00:40 +00:00
Robert Loehning
9f3eaaf5e2 Squish: Use shadow builds in tst_simple_analyze
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ie4696ce1afa695a6db109945ab506ce195322656
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-26 09:15:21 +00:00
Robert Loehning
f562f867fc Squish: Use shadow builds in tst_simple_debug
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ib32c30dc0cc960756bb423348d88452aa20fbfcd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 12:36:58 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
2016-07-22 15:18:00 +03:00
Christian Stenger
d8c18de93c Tests: Fix compile with Qt5.5/MSVC 2013
Change-Id: I60b7222380486c965701abf6fcbfad460797ab27
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-22 12:06:58 +00:00
David Schulz
16ca70994b Clang: Fix assert in code completion test
Assertion failed: IncludeBriefComments == this-
>IncludeBriefCommentsInCodeCompletion, file C:\dev\src\llvm-381\tools
\clang\lib\Frontend\ASTUnit.cpp, line 2337

Only occurs when linked again a debug llvm.

Change-Id: I6a37875fe95852ee2afcef7f6b6b38e9669a6584
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-22 06:35:46 +00:00
Robert Loehning
9600033abc Squish: Fix long outdated messages
Should have been done with
bef8f58fe8

Change-Id: I25730c97fc77cb560d892738545775d024ce5eeb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 13:50:55 +00:00
Robert Loehning
38c7ce6518 Squish: Expect parameter amd64_x86 for MSVC2015
Change-Id: I7a8e1659ca88dc2aaff5129bf2fcf3e7014fe577
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 11:11:29 +00:00
Robert Loehning
7a40d31598 Squish: Use example from Qt 5 in tst_QMLS03
Change-Id: I655f6f01bea097c6ea5874814fd1d267c2e85ffa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 09:05:03 +00:00
Robert Loehning
853a1b2f63 Squish: Wait for ClangCodeModel and catch error
Change-Id: Ia8c52126209697c1bf48a8fa1e422ec2c8869640
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 09:04:52 +00:00
Ulf Hermann
392955488c Move flame graph view from QmlProfiler to separate library
We want to use it for other profilers, too.

Change-Id: Ice4bd7fdfce6e0153d62a7c9a83dc7de6d5cba30
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-20 08:55:28 +00:00
Marco Bubke
e08c1a39e7 UnitTests: Clean up line prefixer test
In TDD development is a standard advised that you setup you values in the
block, run what you want to test in the second and assert in third. We
should try to stick it because it makes reading the test easier.

It is advised too put the setup code after the test if possible.

I used const QList<QByteArray> inputChunks = {"hello\n"} instead of
const QList<QByteArray> inputChunks {"hello\n"} because it is always using
the initializer_list constructor.

Change-Id: I1573566efc1327a2d8681e9ae7bd0ad6ee182789
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-19 16:20:10 +00:00
Robert Loehning
a7933e9372 Squish: Use example from Qt 5 in tst_qml_outline
Task-number: QTCREATORBUG-15469
Change-Id: Ib719e31e53f23a51c4971a53eaa870f4833ef748
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-19 09:20:44 +00:00
Robert Loehning
2fceaa1bfb Squish: Test for wrong manually triggered completion
Task-number: QTCREATORBUG-16607
Change-Id: Ief65726e360db06e6110e19062f37beccc8f8548
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 14:00:28 +00:00
Robert Loehning
d13014ee26 Squish: Don't expect fail from closed bug
Task-number: QTCREATORBUG-16188
Change-Id: I503645b02e71aa7ed1e50da042a6fd5aa7be0b1d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 14:00:10 +00:00
Robert Loehning
75e47e03e3 Squish: Use examples from Qt 5 in tst_session_handling
Change-Id: I038f04b4c6243dfb37516560ca23001d854c1a4f
Task-number: QTCREATORBUG-15469
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 13:59:49 +00:00
Nikolai Kosjar
2647946231 Clang: Fix warning in unit test
warning: comparison between signed and unsigned integer expressions
[-Wsign-compare]

Change-Id: I8c6e2d8f6c536ec3c50293b6302ebb5b1d8313c1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-18 13:17:32 +00:00
Nikolai Kosjar
8f9c42c640 Clang: Merge highlighting/diagnostics messages
The messages

    RequestDiagnosticsMessage
    RequestHighlightingMessage

and

    DiagnosticsChangedMessage
    HighlightingChangedMessage

are always send/received together, so merge them into

    RequestDocumentAnnotationsMessage
    DocumentAnnotationsChangedMessage

Change-Id: I6a0b6281ed1e6efe6cb18386afe99b1d1fb58abf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-18 13:17:27 +00:00
Orgad Shaneh
3be096f152 Utils: Support default value substitution in macro expansion
Syntax is similar to bash substitution:

%{variable:-default}

Change-Id: I50e4e18a186c5408dc8b7b95cebbf891d13e03bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
2016-07-18 13:15:58 +00:00
Christian Kandeler
572b874941 Autotests: Fix qbs build
Change-Id: I362ab24a4f0d74073aef754ffbf60a7c8758af95
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 04:51:17 +00:00
Tobias Hunger
5efd82468b SynchronousProcess: Store raw bytes from stdout/stderr of the process
Only convert the raw output later in a stdOut() and stdErr() method of
the SynchronousProcessResponse.

This is necessary since we have processes that use different encodings
for different sections of the file (I am looking at you, git).

Also remove the signals for raw data on stdout/stderr, leaving only the
signals returning buffered QString lines. This should be safe, even
with UTF-16 output.

Change-Id: Ida613fa86d1468cbd33bc6b3a1506a849c2d1c0a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-15 14:16:03 +00:00
Orgad Shaneh
2ec82a2a93 Utils: Support pattern substitution in macro expansion
Syntax is similar to bash substitution:

%{variable/pattern/replacement} takes the expansion of variable, and
replaces the regular expression pattern with replacement once.

%{variable//pattern/replacement} replaces all occurrences.

Capture groups are supported for both forms.

Change-Id: I67ff91e2dad4dd8be81573ea446cd1093a05ccf6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
2016-07-15 13:26:41 +00:00
Robert Loehning
9ac9211d64 Squish: Use examples from Qt 5 in suite_CCOM
Task-number: QTCREATORBUG-15469
Change-Id: I147c0ff6d402b97a1737a4bb57697c88ac7838be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-15 12:25:15 +00:00
Eike Ziller
7e1b4ccebb Merge remote-tracking branch 'origin/4.1'
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
2016-07-15 14:10:38 +02:00
hjk
26fa769bab Debugger: Add dumper for QMeta{Enum,Method,Property}
Task-number: QTCREATORBUG-16593
Change-Id: Iaa710660d8ef69459596f93831cf8467913f0468
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2016-07-15 10:44:03 +00:00
hjk
5dcf23f62d Debugger: Disable QDateTime dumper for Qt >= 5.8
Chicken out for now after latest internal structure changes.

Change-Id: I66e283e52f9b51a51065520ecd3eb07b15e82fc2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-15 09:07:20 +00:00
Christian Stenger
6063c185cb Tests: Provide qbs file for newly added test
Change-Id: I0b6c41b8c8dbb3ef84bd106aa26357267f5de9a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 04:38:40 +00:00
Christian Stenger
7583557dcc Tests: Fix test when using shadow build
Change-Id: I82ebdbd63a221802f24b2ef17ca6c076151fba0c
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-07-15 04:38:33 +00:00
Ulf Hermann
262270251a Timeline: Move scenegraph test runner into libTimeline
It's built only if TESTS == 1. This way we can use it from qmlprofiler
tests, too.

Change-Id: I170af41341c15c388046d843406e6651114c209a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 15:04:04 +00:00
Thomas Hartmann
e1f9cba249 QmlDesigner.Test: Adding test for implicit components
Implicit components like delegates have to be marked by the rewriter.

Change-Id: I5b9c3e14f26c817e058f2db1e955333d43208719
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 12:35:41 +00:00
Tim Jenssen
1b90a938a3 QmlDesigner: disable debug outputs
+ prettify code

Change-Id: I1749ba5a92b5a1afb1c98bf621aec98cbc838405
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-13 12:24:37 +00:00
Robert Loehning
3685499785 Squish: Update Creator's sources to v4.1.0-beta1
Change-Id: I7176f77a55816bc35184b9689838b78b8d0baff7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-13 12:11:11 +00:00
Thomas Hartmann
bafdc3562d QmlDesigner.Tests: Move test from Qt Quick 1 to Qt Quick 2
Change-Id: I644d86fe77758bc94216db724c7c86bb2d9c205e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 12:06:11 +00:00
Thomas Hartmann
137dee313a QmlDesigner.Tests: remove unnecessary processEvents
- it does not change anything nor behavior nor speed

Change-Id: I9c2cc58eb07a9a432c3fe4fe45daca78e6f29cc0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 11:52:23 +00:00
Thomas Hartmann
64dfb6f0e1 QmlDesigner.Tests: Fix loadGradient()
The order of nodes from directSubModelNodes() was not defined,
since we collect the nodes from different properties ("default/data"
and "gradient").

If we use the interface of NodeListProperty and explicitly
use the default property, then the order is defined.

Change-Id: I7982fa7749d1795ad39a7b76792ad794e49fa9ea
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 11:51:26 +00:00
Robert Loehning
c8e83d0adb Squish: Remove outdated version check
To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-13 11:10:02 +00:00
Robert Loehning
ff9a49f99f Squish: Adjust expected times in tst_simple_analyze
Change-Id: I950d5bdebaaddd63a7a1b0994337fdcb9b806e23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-12 13:51:29 +00:00
Eike Ziller
5f4284e64b Merge remote-tracking branch 'origin/4.1'
Conflicts:
	README.md

Change-Id: I21f96ebb85b8a2b55b4d8066f3c9d4aba5e9b7ee
2016-07-12 13:35:47 +02:00
Robert Loehning
ad3a515beb Squish: Update expected error message in tst_SCOM04
Change-Id: Id1576167daf5b3284f525f33988c066bd4f154cf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-12 09:32:32 +00:00
Marco Bubke
2c698dff86 Clang: Make ConnectionServer adaptable
The server and client are adaptable by template parameter.

Change-Id: Ia28e2863ca73b633689964ea1df6df08f8358ac1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:47 +00:00
Marco Bubke
ae9962c60c Clang: Remove ClangCodeModelClientDispatcher
We always use one client and the dispatching is removing to possibility
of moving commands. Moving the client to IpcServerInterface improves the
code sharing.

Change-Id: I5f102ab7907239572534b7d4c2848abbaade69b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:28 +00:00
Marco Bubke
c5e79f6269 Clang: Decouple ConnectionClient and ClangCodeModel*
We want to reuse the connection client in other plugins. This is the first
step, the next step is refactoring the IPC mechanismn and move it up to
the IpcServer- and IpcClientInterface.

Change-Id: I6eb6db1e9bc18232c8df350a6303afd2edc68da8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:23 +00:00
Marco Bubke
cda6e3c15a Clang: Start ConnectionClient asynchronously
The connection client can block main thread at start up. This patch is
removing the wait functions and using signals instead.

Change-Id: I847c98b095752f6a875c0365bc27361bc5bdd051
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-12 09:07:39 +00:00
Brett Stottlemyer
7f07ec41ab [test] Use command line in proparser
The test reads the command line, but skipped the commit.

Change-Id: If38a5fdd1ec129d77065bfd90403e21fea4eda6d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-11 12:41:12 +00:00
Eike Ziller
61ab1382dc Add auto test for algorithms
The currently most interesting is Utils::transform.

Change-Id: Ic21ec098f15ae4564227a84d11ef95f57ac72d6c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-11 09:56:18 +00:00
Robert Loehning
0d4f4d9ba6 Squish: Update ToolButtons for debugging
Change-Id: I360fab668c2de233aba1b9da06b2769314d343d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-11 09:55:32 +00:00
Eike Ziller
546df37c98 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	README.md
	src/plugins/modeleditor/actionhandler.cpp

Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
2016-07-11 10:46:05 +02:00
Robert Loehning
0dec19173c Squish: Only snooze if bug still requires it in tst_memberoperator
Change-Id: I746007c319823cc7fd166c35f8f94f69badd623b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-08 12:46:00 +00:00