Commit Graph

6972 Commits

Author SHA1 Message Date
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
Robert Loehning
70e328c860 Squish: Wait for ClangCodeModel in tst_CSUP02
Change-Id: I02d5647128492db7d2fce3bf84105f98029ac14f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-08 12:45:27 +00:00
Nikolai Kosjar
ed8b910202 Clang: Honor fixits own locations in ClangFixItOperation
The fixits have own ranges/locations and thus might address more than
one file.

Change-Id: I5ee59944bef588e763a91f054a60823593373a0e
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-07-08 08:22:37 +00:00
Robert Loehning
fe8c717a6a Squish: Update QGroupBox object for tst_CSUP01
Change-Id: I247285ba75d474a5c80592607c349b19f5add937
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-07 13:44:07 +00:00
hjk
e48451b0a3 TreeModel: Consolidate child()/childAt() and rowCount()/childCount()
We never used the possibility to overload the virtual child() and
rowCount() functions, it's unlikely to be needed in future.

Change-Id: I7ebdf4dfc70bb0bcadea9ef3fb88f16632a95696
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-07 13:39:15 +00:00
Eike Ziller
070e6235fa Merge remote-tracking branch 'origin/4.1'
Change-Id: I35ef0d667c759c959edce91569f05ebc7a8ff4d8
2016-07-05 11:28:32 +02:00
David Schulz
de9f7a8978 Clang: Adjust mangled name test to accept any output.
We get different mangled names on windows and unix. As we do not
actually use the mangled names and to reduce the maintenance for this
test accept any mangled name, as long as it is not empty.

Change-Id: Id154da430db6958eb40e5b409e5fb186778d41c1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-05 06:00:11 +00:00
Nikolai Kosjar
36e7f4541f Clang: Pass on file paths with native separators
libclang 3.8 seems to be sensitive to file paths separators [1]. On Windows,
this led to not updated document annotations and/or crashes after reparsing.

When passing file paths to libclang, convert to native separators.
When getting file paths from libclang, convert back.

This handles:
 * main file path
 * file paths of the unsaved files
 * -I<DIR> arguments, the resource path (for builtins) and the paths to the
   wrapped qt headers
 * included header files from libclang
 * source locations from libclang

Also, minimize the conversion in SourceLocation to a minimum by making
filePath() lazy.

[1] https://llvm.org/bugs/show_bug.cgi?id=28381

Change-Id: If5866f34a6fdc6b34b16c022d3988e8e6eae2a0a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-04 13:08:03 +00:00
Christian Stenger
87ab577992 Squish: Adapt to changes of wizard template
Qt Quick template does no more use a pri file.

Change-Id: I5418d1b945c8981218ddcbcf5423d6c623b377b6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-07-01 10:06:22 +00:00
Robert Loehning
c8150dc918 Squish: Click again when hitting scroll bar in openDocument()
Change-Id: Iae5256c894fbd4fcb8b93fd5b6dbe7b56b428982
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-01 09:19:10 +00:00
Marco Bubke
d027cab44e Clang: Rename Ipc* in ClangCodeModel*
We want to share more functionality of the IPC mechanism and for what we
need more interface classes. But we use this names already for the
ClangCodeModel implementation. So we rename the them to ClangCodeModel*.

Change-Id: Ie320e0d3b993586a9bcc6a5aa0d32427af41202e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-30 09:28:56 +00:00
Eike Ziller
ee1da81f55 Merge remote-tracking branch 'origin/4.1'
Change-Id: If6cd798a25de0c6eb1b386177c11bf8de535aa42
2016-06-30 09:40:29 +02:00
Robert Loehning
e065ab2cd3 Squish: Handle empty selection in QWebEngineView
Change-Id: I7e4d53483f3168e78024dcf87125b44f96453fa2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-29 13:58:06 +00:00
Christian Stenger
76781b40a7 Squish: Adapt suite_qtquick to 4.1 changes
Change-Id: Ic1d178820a3c2b6ce61f9e4fc424bc701eca87e5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-06-29 12:39:24 +00:00
Christian Stenger
b1a1e169a6 Tests: Remove invalid qml file
File seems to be useless and is not used at all.

Change-Id: I7b6d7f8804cdf07c6027abb9822d99bdf5ad9dbf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-28 16:36:10 +00:00
Robert Loehning
e0b05758c0 Squish: Fix getHelpViewer() for Qt 5.6
Change-Id: Ica23ec912f95fe10e838e2055d8294be33ef959b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-28 16:13:40 +00:00
Nikolai Kosjar
dc01319cd7 C++: Fix compilation of tst_lexer.cpp
...with MSVC2013.

tst_lexer.cpp(406) : error C2398: Element '1': conversion from
  'CPlusPlus::Kind' to 'unsigned int' requires a narrowing conversion

Change-Id: I1c9415cb02d2f0fa85d48a1abbc688d8f53b5b43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
(cherry picked from commit 04b2194781)
2016-06-28 12:56:56 +00:00
Orgad Shaneh
847637708f Tests: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: If3332a2b4a6d011d2cb74996f5dd750452093f31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-28 12:54:02 +00:00
Eike Ziller
9cf3e30307 Merge remote-tracking branch 'origin/4.1'
Change-Id: Ic8d82172a97bdf1dbf3d047157cc2c8d853f35cc
2016-06-28 12:13:39 +02:00
Eike Ziller
69fa7a8ffb Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
	src/plugins/projectexplorer/runconfiguration.h
	tests/unit/unittest/unittest.pro

Change-Id: I3d327b1198df2a7e9268916af9624ce5d21195df
2016-06-28 11:42:03 +02:00
Nikolai Kosjar
04b2194781 C++: Fix compilation of tst_lexer.cpp
...with MSVC2013.

tst_lexer.cpp(406) : error C2398: Element '1': conversion from
  'CPlusPlus::Kind' to 'unsigned int' requires a narrowing conversion

Change-Id: I1c9415cb02d2f0fa85d48a1abbc688d8f53b5b43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-27 10:37:49 +00:00
Marco Benelli
23ac8b4acf QmlJs: test cases.
Change-Id: I98e6a25e9834ee8bdc66dc4f244c35b187d30ddb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-27 10:37:41 +00:00
Eike Ziller
07fccfe9f1 Merge remote-tracking branch 'origin/master' into 4.1
Change-Id: I56399e6938a5f5096c0b1a1561a54d34a5c96330
2016-06-27 11:40:35 +02:00
Eike Ziller
5fcf0c438f PluginManager: Code clean up
Mostly refactor some explicit loops, and nicer reverse looping.

Change-Id: I102b86da597b37cd496762bd776af73ec407d838
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-24 12:30:05 +00:00
Eike Ziller
667518ad23 Convert some c-style casts
Change-Id: I0d7566d14941a17c3f171b32c9902c22558005bd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-24 12:29:46 +00:00
hjk
61e770e5a7 Tests: Treemodel compile fix
Change-Id: I28132baeb4b5b538f5d8c94c6182b3afe3ac2c78
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-24 12:25:36 +00:00
Nikolai Kosjar
05c1efd8ef Clang: Fix dot-arrow-correction for not-yet-parsed unsaved content
The issue was re-producible with e.g.:

    void g()
    {
        // Type 'foo.' as fast as possible in the next line

    }

This led to "foo->" with completion results as if there was no "foo." at
all in that line.

We relied on a correct position for
translationUnit.sourceLocationAtWithoutReparsing(), but the just typed
characters were not yet reparsed. And we do not want to reparse at that
point since takes too long. We already determine the utf8 position for
the dot character, so simply use that instead.

This completes commit 17c1325cc4.

Change-Id: I669888b5c17ee63b2aec7b16c9921f9d79e281f9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-24 08:31:28 +00:00
Marco Bubke
cc804d542d UnitTests: Disable small string test
Change-Id: I508e43923efc065fce9a79edebeff79606069abd
(cherry picked from commit 505c9be9af)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-23 12:39:14 +00:00
Nikolai Kosjar
438bd85b84 Clang: Fix updating revision number for all translation units
Change-Id: I1ad305ed081aecadde968e041f7b99a24a1c4784
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-23 06:29:14 +00:00