Commit Graph

5028 Commits

Author SHA1 Message Date
Robert Loehning
5dd44e0a7b Squish: Update testdata for tst_simple_analyze
Project template was changed in
b18e084fc0

Change-Id: Ib37b1e5c5c30f75bac302d605403755c8f450fbf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 09:50:02 +00:00
Robert Loehning
aa29fcf1fb Squish: Update tst_SCOM02
Project template was changed in
b18e084fc0

Change-Id: I4959c15a452cf713cad86af10b81376b59b816b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 09:49:52 +00:00
Ulf Hermann
51e074b0b7 Timeline: Remove TimelineModel ctor with private object
Change-Id: Ie4e50c08f77cd710f067f1c5e33a1656878e0640
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-11 12:32:19 +00:00
Eike Ziller
c3ee2d06ba Algorithm: Allow sorting container of pointers with member (function)
Change-Id: I2928081750f86b66e969ec2f7ade9e67ce19a825
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-09 13:17:43 +00:00
Orgad Shaneh
a23e0692b4 Utils: Introduce sort variants for member and member function
Change-Id: Iff29f2c55a08e85de7f0ff4e431f326e351e5305
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-09 10:51:28 +00:00
Marco Bubke
092df2edaa Clang: Smallstring should not depend on std::ostream
We move the io operators in an extra header file because if we would
include ostream in smallstring.h we would blow the compile time.

Change-Id: Iea61ceedbbbcdd2adc6dc149794dab6e743084f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 15:01:53 +00:00
Marco Bubke
f56ec53fa1 Clang: Test for file path RequestSourceLocationsForRenamingMessage
Change-Id: Ia384deb60e644d8894d7c56f81b3deb8b7706c11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 14:19:02 +00:00
Marco Bubke
98a167c0d5 Clang: Fix template renaming
Change-Id: I8040fe8dfc99d66e242ce2ff8589aa914838bfc9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:50:25 +00:00
Marco Bubke
ec06fd0e84 Clang: Use std::replace instead of std::transform
Change-Id: I60e42577631dee5cf05b1129a49ea36c391e8923
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-08 13:27:38 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Marco Bubke
4cdb5bab15 Clang: Add clang refactoring
Change-Id: I2e3f36f810276da3f8dc7dcc587b06f8edb586d3
GPush-Base: d02f51b48fc752fddcdef6dcb32b3f7f6c0195a3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:37:19 +00:00
Orgad Shaneh
dddf0d2b3f Tests: Remove Utils dependency in algorithm test
It depends on header-only implementation.

Change-Id: Ib0a1dc92789b2d3e527f1d3cd1a4393f92e161e1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-04 11:27:44 +00:00
Christian Stenger
3e7707148e Tests: Fix missing reference to algorithm test
Change-Id: I7323995c01e1633b4a84fd24b2a3b99d663e5d13
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-04 11:27:16 +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
hjk
def8ca8ba1 TreeModel: Move some base TreeItem code out-of-line
Avoid code explosion.

Change-Id: I7d239a4560e90b68cc4991341adf940a98776254
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-03 09:23:46 +00:00
Oswald Buddenhagen
48687c0fa1 adjust to changed QMakeParser API
amends b7706cdfeb.

Change-Id: I83fc5d2b1c660d3c6f9c456b0f54c0fd2d669140
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-03 04:35:46 +00:00
Marco Bubke
0549c6af97 Utils: Add std::string conversion constructor and operator to small string
Change-Id: Ia76d7647fc8d2c9b72bc5bce2e7a6e2c3fcc18cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:23 +00:00
Marco Bubke
390e2d164c Utils: Add iterator constructors to small string
Change-Id: Ib8fcacd5dc520842cf5cee73ea21c021221158ca
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:19 +00:00
Marco Bubke
7610e48716 Utils: Fix smallstring
Change-Id: I681df8c3fd9aa84f14d5d581633894605f56b71a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 13:38:14 +00:00
Oswald Buddenhagen
45b854dbd5 enable c++11 really globally
... and remove all instances that became redundant now.
this excludes everything that comes from outside qtc, or looks like it
could "leave" it.

Change-Id: Idc8baad17cd1ffdc5e160ec48ea3292d633a2562
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-02 07:52:38 +00:00
Robert Loehning
81bae84411 Squish: Stabilize tst_simple_analyze
...by giving the Quick app more time to finish.

Change-Id: I788715bcfa0949ee1873295eb869fb4e04fd00b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 16:21:39 +00:00
Orgad Shaneh
35d7352b3e Merge remote-tracking branch 'origin/4.1'
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
2016-07-29 16:13:18 +03:00
Thomas Hartmann
3bd9dbf5b2 QmlDesigner: Adding testproject for directory imports
Change-Id: Ib9f4feb745722dc1e43c6651ed1cfc4a017818e7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:04:17 +00:00
Nikolai Kosjar
38f72855b6 Clang: Process distinct documents concurrently
Speed ups the typical use cases that can profit from this:
 * Change a header file and switch then to source file
 * Open documents one after the other (Follow Symbol)
 * Change documents visible in splits (e.g. by refactoring action)
 * Restore a session with multiple splits

Fixes the test ClangIpcServer.GetCodeCompletionDependingOnArgumets.

Change-Id: Ia575bd59780df14146dfc091a4d48794e4a0543d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 09:42:31 +00:00
Nikolai Kosjar
90f94363db Clang: Extract TranslationUnitCore and (re)parse explicitly
Extract TranslationUnitCore, which is the API for the high-level
operations we need. TranslationUnit does not call any clang_* functions
anymore, except the one needed for disposing the CXTranslationUnit - for
now, we keep TranslationUnit the owner of TranslationUnitCore.

TranslationUnitCore will be passed on to the worker threads.

With this, the current "TranslationUnit" looses its meaning. We will
rename it to "Document" in a follow-up change.

                            ***

TranslationUnit::cxTranslationUnit does not implicitly
creates/parses/reparses anymore. We use more verbose update operations
now.

The test ClangIpcServer.GetCodeCompletionDependingOnArgumets fails now
because of this - CodeCompleter::completeHelper() does not recreate the
translation unit anymore, thus working on the old data.

This will be addressed in a follow-up change.

Change-Id: I6213d6f1609cd3c9a54666c84cb8b623b2fefe1c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 09:42:24 +00:00
Nikolai Kosjar
dc734f45fd Clang: Extract TranslationUnitUpdater
...in preparation for concurrent processing of documents.

Parsing and reparsing is handled by TranslationUnit. Since we will do
this in a different thread, extract the core logic into the new class
TranslationUnitUpdater, so that we can prepare the necessary data for
the run and then later incorporate the results of the parse/reparse.

Change-Id: Ic9d936d193ee6795a755f0cfc38c0b2a7bd402cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 09:42:18 +00:00
Nikolai Kosjar
606d41187c Clang: Prepare for multi-threading
* Make the necessary data implicitly shared since it might get
  accessed/modified from two different threads with follow-up changes.
  This applies for UnsavedFiles/UnsavedFile and ProjectPart::arguments().

* Avoid returning references.

Change-Id: I98842c1cb90ae0d344a15c63b72cbc89568722d3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 09:42:14 +00:00
Oswald Buddenhagen
034cff4693 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
2016-07-27 12:45:54 +02:00
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