Commit Graph

44349 Commits

Author SHA1 Message Date
Christian Stenger
5988fd0f5c AutoTest: Add minimum support for debugging tests
This adds another context menu entry for items on the test tree
to allow debugging of a single test.

Task-number: QTCREATORBUG-16070
Change-Id: I98f56b0f22c94ad71f0b91d690383043ed27f1c7
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-22 10:51:12 +00:00
Eike Ziller
0e923c2a75 Merge remote-tracking branch 'origin/4.1'
Change-Id: I5cdc704c827a6f5abf4dc39e2a131d53df328bd2
2016-06-22 11:29:12 +02:00
Eike Ziller
4f9016e03f Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/android.qbs
	src/plugins/android/androiddevice.cpp
	src/plugins/autotest/testcodeparser.cpp
	src/plugins/debugger/analyzer/analyzerstartparameters.h
	src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.h

Change-Id: I2474d06f2309fa71210a8401846bc2ef85bebf1d
2016-06-22 11:09:32 +02:00
Finn Brudal
23cd42557d CppTools: Fix include/framework search order
Task-number: QTCREATORBUG-11599
Change-Id: Ie0bd25e0d6376b5e2c0e251e64aad8dfb773e76e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-06-22 07:52:58 +00:00
Tim Jenssen
e420d8b692 fix msvc2013 build
Change-Id: I9b21102285751d0bc6952c949d65ed57edb64bcf
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-22 07:48:04 +00:00
hjk
3f11ef9216 Avoid using dynamic_cast<>
dynamic_cast<> breaks in cross-library situations. In the past
the issue was witnessed on Mac, this time on FreeBSD in
various configurations.

The workaround deployed here is to manually create unique
type ids in form of (addresses of) global variables.

Task-id: QTCREATORBUG-16462
Change-Id: Ie28fbb3d31d06c1a722a3d9ea808831191298e71
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ralf Nolden <nolden@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-22 07:31:41 +00:00
Orgad Shaneh
7a037841a4 BinEditor: Clear data on setSizes
Was removed in 5098787a.

Jumping to an address in the current view doesn't refresh the data.

Task-number: QTCREATORBUG-11064
Change-Id: Ib9682f7809ada58d7a67683415fec818a8c00620
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-22 06:47:17 +00:00
Orgad Shaneh
78cf39cf27 BinEditor: Remove unneeded viewport update
Already done in setSizes

Change-Id: Ib64d27f86bcc03e4e5f667f92262a8be67b252ee
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-22 06:47:02 +00:00
Orgad Shaneh
e51322c314 Debugger: Set sensible default size for memory view
By default the view is too small when it opens, and it must be resized
every time in order to see its content...

In addition, do not move the view next to the cursor. It is typically on
the right side-bar, causing the window to be clipped on the main window
edge.

Change-Id: Ib6c6f4a478fe5d571fc50d21d239cee591d0d3bf
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-22 06:46:56 +00:00
Leena Miettinen
4df0421b12 CMake: Fix capitalization in a message
Change-Id: I7bd0c2198d4cf3c49930b8a57f37f2a07752e028
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-21 15:33:04 +00:00
Alessandro Portale
8588cf268f Utils: Replace Theme::widgetStyle with a flag
Theme::widgetStyle with its two possible return values makes less sense
than a bool flag. Especially since we already have several separate
theme flags for ui elements which might be "flat" or not.

Change-Id: Ic521bb58c04386b735b784079de05e521bc1f45f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:24:58 +00:00
Alessandro Portale
3b30617758 Core: Improved theme-awareness in application menu painting
Using theme colors rather than hard-coded ones and at the same some
simplification.

This is needed for an upcoming "Flat Light" theme.

Change-Id: I8a8715a16d1b246c5228978633143eb64d371701
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:24:15 +00:00
Leena Miettinen
306e253485 LLDB: Fix punctuation of a message
Change-Id: I39812410ca6117c7f3b7ea8d2a33d3ec5bf490c0
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-21 14:28:43 +00:00
Maurice Kalinowski
edb27b53f4 WinRT: Enable plugin for supported host platforms.
Latest updates caused the winrt plugin to not load on Windows 10.

Change-Id: I5a4c34e829e762f83f41f891965f22cf47fd9471
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-21 12:17:20 +00:00
David Schulz
6750607244 Editor: Skip auto completed character only if it was recently inserted.
This means you can skip automatically inserted characters as long as you
don't explicitly move the text cursor and the editor doesn't lose the
focus. This will be visualized by highlighting the automatically
inserted character as long as you can perform the skipping.

This will reduce unexpected skipping in the case a cursor was explicitly
placed before an closing brace and a closing brace is typed.

Change-Id: I28e29e79ba10c9c48e8bc8817405fea630cca9bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-21 11:56:56 +00:00
Thomas Hartmann
89e8fd9088 QmlJS: Remove slow checks
These checks slow down linking for big projects.

Change-Id: I76a8897528b03ae3a31d5919be85c5ae7c3543a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-21 11:16:35 +00:00
Eike Ziller
5aa7e2915b PluginView: Do not disable required plugins
It was possible to disable required plugins by deselecting the whole
category.

Task-number: QTCREATORBUG-16321
Change-Id: I983a3461ac0cf610f9cd5e4ffcec5e176256eb53
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-21 09:53:17 +00:00
David Schulz
80b149935e Clang: Fix incorrect size check of message reader.
Change-Id: Ia734c5234d899e71da46d8111299cf8f86dc67c2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-06-21 09:02:20 +00:00
Christian Kandeler
08dcad9c82 QbsProjectManager: Add GUI for forcing Probes re-execution.
Change-Id: I67e2f6d24bd923c9691a9b8aaec161d01f38a16c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-06-21 08:22:10 +00:00
Orgad Shaneh
b57ed862e9 FakeVim: Remove unused meta object
Change-Id: If20fe6c1a68470a5f0731f42d94af6123095a1d2
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-21 08:02:35 +00:00
Tim Jenssen
28c8412797 QmlDesigner: remove zorder properties
Change-Id: I1bf044ec971ffcee5643ecedbf62f2a7f696e283
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-21 07:32:05 +00:00
Nikita Baryshnikov
ae97bb40f9 QmlDesigner: remove config.pri includion
it was removed in 0a67076ef4

Change-Id: I1b425fc76b377fc4eda5ac2443db356ef37b5da4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-21 06:25:26 +00:00
hjk
441b81b2b3 Utils: Add a TypeTreeItem::forFirstLevelChildren iterating function
More typesafety.

Change-Id: Ica50e1c38f6c5d7d3545b588c698f0cbb5775672
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-21 06:00:52 +00:00
Jake Petroules
069a4dc7dd Add macos value to qbs.targetOS.
Change-Id: I38f810ae72ff1f7ef428835b2eeeed6d726d4727
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-20 16:17:17 +00:00
Tim Jenssen
a6d21cc1f7 Qmljs: small QHash improvements
Change-Id: I79a5504c8471b66540aac8047fbcf760ceb6b10f
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-06-20 14:08:43 +00:00
Christian Stenger
ccda65bf83 AutoTest: Avoid fetching WorkingCopy from multiple threads
Instead fetch it once before starting asynchronous processing.
Backported from 72e6dd2ab1 on master.

Change-Id: If159311d1ce244c39482acb2ed0d7e33907a2933
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-20 13:30:21 +00:00
Orgad Shaneh
edc77e339f TextEditor: Default to Text style on style absence (take 2)
The current default is black foreground, which is invisible on dark
color schemes.

Change-Id: Iaa2520422ea6a6b355c89d71d204a7620aa98fcd
(cherry picked from commit 2c3f3970d5)
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-20 11:58:02 +00:00
Orgad Shaneh
ac931e19d5 TextEditor: Improve default color mechanism in FormatDescription
Required for providing defaults for non-existent entries that should
fall-back to text.

Change-Id: I8ce33257a55cf173a5e9b904b7da6326163b4261
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-20 11:57:57 +00:00
Orgad Shaneh
9577eb72b4 TextEditor: Minor cleanup in FontSettings
Change-Id: Ib12e2ea2c1afc9a32d7d21636bc8097497fb74b1
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-20 11:57:54 +00:00
Orgad Shaneh
246e72262c CppTools: Separate highlighting for function declarations and calls
Task-number: QTCREATORBUG-15564
Change-Id: Iab1b60e19448202432f98295c89769cd376aa03f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-20 10:55:31 +00:00
Christian Stenger
72e6dd2ab1 AutoTest: Avoid fetching WorkingCopy from multiple threads
Instead fetch it once before starting asynchronous processing and
accept that current state of the WorkingCopy might be not completely
up to date. This avoids a crash that might happen when the code model
tries to update the WorkingCopy while the test code parser fetches
information of the WorkingCopy.

Change-Id: I2a893bc8814090361305657ed3c3d772c7bf07d5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-20 10:50:28 +00:00
hjk
cfc724e709 Utils: Make remaining TreeModel iterating functions 'const'
This follows the rest of similar functions. It is arguably abusing the
C++ misfeature that 'const' only applies to the top level, but
avoids re-typing the same implementations stanzas for otherwise needed
const/non-const overloads.

Change-Id: If90fc879b406fd94714995ff4c42a4ebe3c69faa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-20 10:14:59 +00:00
Antoine Poliakov
ab3e5d0ed1 Toolchain: Fix -std=gnu++XX gcc/clang option parsing
Now -std=gnu++XX is handled like -std=c++XX
In particular, gnu++1y is correctly mapped to StandardCxx14 instead
of StandardCxx11, and gnu++14, gnu++17 and gnu++1z are recognized.
This makes clang static analyzer plugin for for C++14/17 code bases.

Task-number: QTCREATORBUG-16290
Change-Id: I2018b9a365bb0a9cae7573b4e4f74deb830a7758
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-20 10:04:11 +00:00
Christian Stenger
fad1f14d64 ProjectExplorer: Fix compile
Change-Id: Idcb3297814a95073a23f5b6de300fbc6ef766ce0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-20 09:08:47 +00:00
Christian Kandeler
bda0d226b6 Update qbs submodule.
To HEAD of master branch.

Change-Id: I5a5db59f4c7dec82f257508ddac0c9c9bcd6309d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-20 08:56:12 +00:00
Tim Jenssen
c13f2f0784 init roleNames only one time
Change-Id: I61e120c2e5c4a036c001b410331e09993d7594d6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-20 08:49:33 +00:00
Arnold Dumas
0e3c5feb42 QtSupport: Don't read old configuration file
Don't read configuration file for pre 2.6 versions.

Change-Id: Ib0cb625931625d0cec81fd2f385a9ed03e83a989
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-20 08:00:24 +00:00
Alessandro Portale
abb63602de Utils: Make the "shadow" under toolbar icons optional
In preparation od a "Flat Light" theme, where shadows under the icons
would have a negative impact.

Change-Id: I2d9d3563c90336640513c1a970a432898dd63cfc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-20 07:49:56 +00:00
David Faure
52ed384549 cmake: resolve symlinks when comparing source directories.
Testcase: trying to use an existing build dir which was
made for /d/foo where /d is a symlink to $HOME/d.

To help understanding the problem, the error message now prints
both source dirs, the one found in the builddir and the one we expected.

Change-Id: I9a24fbd6ef3cf8108c5edba0d2a5b99ecdea0e89
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-20 07:37:41 +00:00
Eike Ziller
ff2ba0cef5 Bump Version
Change-Id: Ifc422cd795803d419a7aba20e37923fb9084cf43
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-20 07:22:40 +00:00
hjk
5ff15e89f2 Utils: Add a typesafe TypedTreeItem::childAt(int) overload
Change-Id: I5285d07576803511b23cdb19c930df286c430f92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-20 06:12:44 +00:00
Christian Kandeler
76bd7f202b Fix qbs build.
Change-Id: I7435e9ee10180ce3bf052c4906eaba215b1b3f99
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-19 19:45:03 +00:00
Orgad Shaneh
7a5b45bdc2 Git: Limit blame range only for multiple lines selection
Selecting a word should not result in a single line blame...

Change-Id: I03e8b75c519eb555b77985e7c68b3429bfff9446
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-17 14:37:17 +00:00
Christian Kandeler
68990f329f Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: I846f5f97071ad3567409dcdf6dfa7fe66931ada1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-17 14:24:45 +00:00
Alessandro Portale
6a8d6296b1 Utils: fix typo in Utils::Theme enum
IconsModeProjetcsActiveColor -> IconsModeProjectActiveColor

Change-Id: Id13039b49102e75ac3d7558ff79e971bce54ed43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-17 13:40:30 +00:00
Christian Kandeler
31258ec555 qbs build: Introduce libclang module.
This is The Right Way to detect libclang. Using a Probe will also
slightly improve performance in qbs 1.6 due to the result caching.

Change-Id: I063a8d108d02b620dda2df75dd8c014c84f27ec7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-17 13:33:03 +00:00
hjk
1ce258d710 Debugger/Utils: Remove TwoLevelTreeModel
It's well covered by the more generic Utils::LeveledTreeModel now.

Change-Id: I3982ad39a64742b0a0a59433024457db3808bfc7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 12:40:09 +00:00
David Schulz
6bd7c3ef3b AutoTest: Use wildcards for gtest filter.
If all test sets of a test case are selected use a wildcard filter.
This reduces the length of the command line which is limited on
Windows.

Change-Id: Ie4c1e3ede91eff6293c982e03d454bcf8c9b5815
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 12:33:39 +00:00
David Schulz
537c6fa9a8 AutoTest: Print error message when test couldn't be started
Change-Id: Ibae31902e8a4ece25af8a97f6202269f1eecf597
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 12:33:32 +00:00
Orgad Shaneh
4dd2571f2c QtcDebugger: Fix warning on Windows 64bit
Change-Id: I4d97c052b2ef781d2033033310e2dc6dff2e99e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 12:32:51 +00:00