Commit Graph

7671 Commits

Author SHA1 Message Date
Robert Loehning
80ef8d11f9 Squish: Handle failing startApplication() without ClangCodeModel
Change-Id: Ic50939219c8dcf2b04423d99d0d5021de8f26afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:34:38 +00:00
Robert Loehning
0e299cbd0b Squish: Expect failures in tst_memberoperator on Windows
Change-Id: I582109d104816545c804340c7e0d4dbe343d55f3
Task-number: QTCREATORBUG-16336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:30:57 +00:00
Christian Stenger
0aff733a91 Squish: Stabilize clickOnTab() on OSX
Change-Id: I984a6a2012668e0b0095b2118b9d7001c7cda616
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-25 04:41:31 +00:00
hjk
fbc82d3f88 Debugger: Fix dumping of numeric QJsonValue inside arrays
Task-number: QTCREATORBUG-16313
Change-Id: I544e89fc964cd404652d8ea0c8df127e51235292
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 13:09:19 +00:00
Robert Loehning
6a74d8cad1 Squish: Fix suite_SCOM for Qt 5.5
Change-Id: Iea47ca2c74a6ac2287aee26418636abcb748a5d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 11:36:17 +00:00
Christian Stenger
c9dac0fa61 Squish: Raise waiting time when using FileDialog on OSX
Necessary especially when trying to open big files for which the
system file dialog of OSX is creating a preview.

Change-Id: I6d352b78f76571fbb7224902b05e228d584c443a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-24 09:59:13 +00:00
Ulf Hermann
6b4963b549 Ssh: Implement tcp/ip forward tunneling
Change-Id: I529b3392ea7e4cbae2c736c9f55352ef6b19da98
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-23 07:44:06 +00:00
Victor Heng
11ef0db2fd QmlJS: Keep pragma directive when reformatting QML files
Change-Id: I1f11e95565a90e4fc7b908c03d49f6abbd37b8be
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-05-19 09:55:11 +00:00
Eike Ziller
ec231b5910 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4
2016-05-18 12:12:46 +02:00
Robert Loehning
8c8ed3294f Squish: Raise timeout for help content
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-18 08:43:45 +00:00
David Schulz
8da31c87ee Add version number to lib dependencies on windows.
Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-18 05:02:40 +00:00
Robert Loehning
990e2a83ca Squish: Fix tst_HELP02
We don't just need any items in the model,
we need an item that passes the filter.

Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-17 13:11:31 +00:00
Orgad Shaneh
aca8f9a731 UnitTest: Fix compilation
Change-Id: I4aa18c552bdfb8bb685e224b63c6080f25afa567
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-17 10:17:43 +00:00
Eike Ziller
6efd8e33e2 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a
2016-05-13 16:24:37 +02:00
Tim Jenssen
7e08363052 qbs build: remove unnecessary script dependency
Change-Id: I0e5764ffc9a6146932c43d96a31138451260c161
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-13 11:42:43 +00:00
Christian Stenger
1914329ec2 Squish: Fix tst_HELP02
Content of the QHelpContentWidget gets populated asynchronously,
so wait a bit to have at least one entry - which normally should
be our own documentation.

Change-Id: Iad78f0bab0dd7f2f5a83cd94d2b2830ba146f554
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:36:55 +00:00
Christian Stenger
dbfa9280b0 Squish: Fix assigning shortcut
Change-Id: I32d563a198ec1e56b86e97f6803dd2e15f1bd565
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:26:43 +00:00
Christian Stenger
07ba87349d Squish: Fix accessing Options on OSX
Accessing the application menu inside the menubar of OSX
does not work properly since using Qt5.
For some time using default keysequences worked fine, but
for the Preferences (Options menu) this stopped working,
so make the used hack even more crude.

Change-Id: I48ed37dc69b8c64f649f0130d48d4deb02afb87e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:08:06 +00:00
Christian Stenger
53770ebaa5 Squish: Add some verbosity to figure out what might be wrong
tst_HELP02 is consistently failing if running from inside Jenkins,
but passes when executed locally.

Change-Id: I70fe9b7dc74dbf82f102b5670ddf04bf0dbfa270
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-12 12:40:49 +00:00
hjk
dee7ad3806 TreeModel: Rework tree iteration
Use function objects to apply directly during a depth-first
walk of the tree instead of faking a flat container of tree
nodes. Less code, and allows even some non-const operations.

Change-Id: I804ab11df358fe937b40809cbcb772e6f3ff8dc5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-12 12:30:36 +00:00
Eike Ziller
9e66ce48e4 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
2016-05-09 16:37:41 +02:00
hjk
482bbec175 Debugger: Fix QUuid dumper with large numbers and LLDB
Change-Id: I357063022435d461d0b52c14541a4dfae69a1cdb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-04 10:32:20 +00:00
Nikolai Kosjar
17c1325cc4 Clang: Fix dot to arrow correction
The position of the dot character was determined on an outdated
translation unit.

We queried the translation unit for the source location of the dot
character, but apparently clang_codeCompleteAt() does not update the
source locations for the translation unit. And we do not want to reparse
since this is expensive. Thus, determine the byte position manually by
scanning over the document until the right line/column is reached.

Change-Id: I25e256bb81a83bb71c7e46a0fb3e927bf4031b16
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-03 12:19:13 +00:00
Eike Ziller
0f94aa3f4d Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
2016-05-03 11:49:01 +02:00
Orgad Shaneh
e231073a40 Qbs: Enable exceptions where needed
Align with qmake project

Change-Id: Ic68619a0b5e3bf6052c8b52165337063a24e2b5d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 09:19:05 +00:00
Christian Stenger
43f245bda3 Tests: Fix missing return
Change-Id: I78fdad351d7389f2d046c2cf1793cdca2d972815
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-28 13:55:33 +00:00
Nikolai Kosjar
a717e980e7 C++: Guard against parent binding loop
Task-number: QTCREATORBUG-16146
Change-Id: Ib2a790954517859acd7ca5f16c7d889d28208fb0
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-04-27 11:42:21 +00:00
David Schulz
abeac62191 Fix building creator with the intel compiler.
Replacing all occurrences of win32-msvc* with msvc.

Task-number: QTCREATORBUG-16118
Change-Id: I46bd54628bffb04c24bca587fd9dd7684e888f1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-26 12:32:54 +00:00
Nikolai Kosjar
7b7b1823cb Clang: Avoid parse loop if libclang crashed or file vanished
Remember whether clang_parseTranslationUnit() or
clang_reparseTranslationUnit() failed the last time and do not trigger
parse/reparse again.

Also, check whether the main file exists before reparsing.

Task-number: QTCREATORBUG-16051
Task-number: QTCREATORBUG-16140
Change-Id: Ied39e66a18032854911229898573941fe2ada35b
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-04-26 12:28:16 +00:00
Eike Ziller
4a826ada04 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
2016-04-22 15:13:58 +02:00
David Schulz
cc04b84917 Fix compiler warnings on windows.
Ignore some warnings inside 3rd party code and fix a lot of conversion
warnings.

Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-22 07:37:31 +00:00
Nikolai Kosjar
11836a14cf Clang: Fix SOFT ASSERT: "!m_functionName.isEmpty()"
...that ocurred for e.g. "foo (<COMPLETE HERE>".

We did not handle the following cases:
 1) white space after the function name
 2) nothing before parenthesis

Change-Id: If6aedd2cc938df30516e13a860d07d7a509633ae
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-04-20 13:03:32 +00:00
Eike Ziller
ee8bf341c6 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
2016-04-20 14:58:48 +02:00
Nikolai Kosjar
211894d348 Clang: Tests: Fix compilation with clang-3.6 using stdlib
When using stdlib (default on Linux) and compiling with "-std=c++14", errors
like the following occurr. Avoid them by not requiring c++14.

  $ clang --version
  Ubuntu clang version 3.6.0-2ubuntu1~trusty1 (tags/RELEASE_360/final) (based on LLVM 3.6.0)
  Target: x86_64-pc-linux-gnu
  Thread model: posix

  $ cat clangtest.cpp
  #include <random>

  $ clang -std=c++11 -fsyntax-only clangtest.cpp # Fine with c++11/stdlibc++
  $ clang -std=c++14 -fsyntax-only clangtest.cpp # Ops with c++14/stdlibc++
  In file included from clangtest.cpp:1:
  In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/algorithm:62:
  In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_algo.h:65:
  In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/random:39:
  /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace
    using ::gets;
          ~~^
  1 error generated.
  $ clang -std=c++14 -stdlib=libc++ -fsyntax-only clangtest.cpp # Fine with c++14/libc++

See also https://llvm.org/bugs/show_bug.cgi?id=18402.

Change-Id: I2ab3ea837b80196b51d8816ee8aa26a4a531e939
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-19 12:01:59 +00:00
Marco Benelli
22acc52d71 Qml code model: handle modules dependencies.
Fix the broken hierarchies between qml objects.

Change-Id: Id36c735cab0129af382fab7b9dd90c228304168c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-19 11:18:21 +00:00
Nikolai Kosjar
9a35b121ee C++: Fix accessing invalid file id of Symbol
Symbol::_fileId can be null if the Symbol was created with a null
translation unit. That is the case for temporary symbols created for
lookup purposes (CreateBindings has a _control with no translation unit
and thus creates symbols with no fileId).

Task-number: QTCREATORBUG-15967
Change-Id: Iee518b39ba3b636fe1658e74179db3aad054d6f2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-18 12:31:37 +00:00
hjk
bd406e3cd0 Test: Fix typo in gmock detection message
Change-Id: I8c95b5279349b92f232c26f57ade91f5b51e3b55
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-04-18 11:14:06 +00:00
Robert Loehning
9e63807134 Squish: Remove workaround for fixed bug
This reverts commit ca66ad3d0c.

Task-number: QTCREATORBUG-15806
Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 13:19:59 +00:00
Christian Stenger
532cd88dd7 Squish: MSVC2015 and Build Tools are supported...
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-15 12:08:58 +00:00
Eike Ziller
8a77eacf8d Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
2016-04-15 10:07:55 +02:00
Sune Vuorela
55bfa4401f Keep readonly qualifier
Let's not reformat readonly qualifiers away. They are likely there for a
reason.

Task-number: QTCREATORBUG-15745
Change-Id: Iaab7a8edb47fccd0cf36759750500a93be45bbc2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-13 07:59:44 +00:00
hjk
c0c5aad8e6 Debugger: Adapt dumper test to base class sorting
Fallout from e73a9c1b0d.

Change-Id: If06ba8424bd264137dcdcdd721317ce6785a91b0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-12 14:05:38 +00:00
David Schulz
54a51979c0 Fix std::list dumper test for cdb.
Change-Id: I071b4c918cf6d236110c48085af607f8ff578e30
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-12 13:55:36 +00:00
Eike Ziller
817db22fb9 mapReduce: Add remaining API use cases from QtConcurrent
- simpler mapReduce
- blocking mappedReduced
- map with iterators
- blocking mapped

The special QtConcurrent::map for modifying the container is not needed
(it simply is Utils::map with a map function that takes a reference to a
value, and either non-const iterators or a std::ref container).

The special (blocking)filter((ed)Reduced) is simply done with the
Utils::map(ped)/map(ped)Reduce(d) functions with a map function that
takes a QFutureInterface and only reports values if the value should not
be filtered out. That way it can also be used as a
"filteredMappedReduced".

Change-Id: Id8dcbb7277be4d0e27b9e1691df35535dd481924
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-12 12:28:15 +00:00
Eike Ziller
12ef434e40 mapReduce: Allow init and cleanup functions without future interface
Change-Id: I49c5f66877db6f7a3b5d175e9ee333451b25d4de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-12 12:27:59 +00:00
Eike Ziller
5c87432260 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
2016-04-12 11:34:46 +02:00
Orgad Shaneh
46739bcdf3 Qbs: Add offsets autotest
Change-Id: Ibb918466c057030e1dddd4a2e84e56de5cdbae64
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-04-11 19:34:19 +00:00
Orgad Shaneh
392ca26287 Debugger: Minor cleanup in offset tests
* Remove unneeded STRINGIFY macro
* Add :: between class and member in test names
* Remove extra comma

Change-Id: I5a5e9d318133934885c0bdf6aefc1fd3abc2acb0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-11 05:05:20 +00:00
hjk
feecfcbc3a Debugger: Avoid #define private public in auto tests
Change-Id: Ie8d9c7745a45fef1de2c446a78faf9096b1c7bb0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-08 13:08:55 +00:00
hjk
e9b1e493c2 Debugger: Move struct sorting logic to generic parser
Backends only have to specify whether an object members are sortable
in principle (e.g. all structs), and some numeric 'sortgroup' value
for member items (higher values are always sorted on top).

Change-Id: I10ce94580374fed48a35f058a575a1408d6801af
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-08 10:22:31 +00:00