Commit Graph

50929 Commits

Author SHA1 Message Date
Tim Jenssen
2680e8f12e ImageViewer: remove unnecessary class forward
Change-Id: I39df5ceeb3fb07b039d5ad1388db866e8aaccc04
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 14:48:45 +00:00
Tim Jenssen
1898ba5ad3 make library defines more consistency
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-12 14:48:34 +00:00
Alessandro Portale
1ff8b46d0a Utils: Create _TOOLBAR variants of some standard icons
And use these in scxmleditor. qmldesigner will also use them.

Change-Id: Ifd057531873a8cb8da3d6e033fbf606f17638c3e
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-12 14:19:29 +00:00
hjk
6bb0880a6b ProjectWindow: Rename SelectorModel to ProjectWindowPrivate
Less quirky, and that's what it is now.

Change-Id: Iae18f289ab498eb409579235e96325a7d0341e1a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 14:00:50 +00:00
Nikolai Kosjar
3a369552c6 CppTools: Classify ambiguous headers depending on other files
This applies for all project managers, except qmake. The qmake project
manager will make use of this in follow up changes.

Before, "foo.h" was always recognized as a CXXHeader. Now, it depends on
the other files. E.g. in a file list {"foo.h", "foo.c"} foo.h is now a
CHeader. In {"foo.h", "foo.c", "bar.cpp"} the file "foo.h" is ambiguous
and we will create two project parts, one where it is a CHeader, the
other where it is a CXXHeader.

Change-Id: I50505163368742584b1380c284d42cbe07cb4fc9
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-12 13:49:09 +00:00
hjk
f54d4fc3db Core: Don't assert on valid nullptr cases
Change-Id: I40919e9ba16c2cc8cf401fc0c9f49267a215af71
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 12:23:20 +00:00
Andre Hartmann
81ebdf3b02 Git: Add rebase --skip action
Task-number: QTCREATORBUG-17350
Change-Id: I42f081dbdb47c78055c7167ff47c7f3d9af4c856
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 12:15:12 +00:00
Christian Stenger
69a94c2c28 AutoTest: Always parse if plugin is enabled
Remove the 'Always parse' setting and respective special handling.
This simplifies the handling of parsing for tests and removes
strange special handling that was introduced in earlier versions
and led more to confusion on the user side.

Change-Id: Ia4d122ed448244f3cb3876dda9930864afde9c28
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-12 10:57:47 +00:00
Orgad Shaneh
6a1ead7abb Fix clangrefactoring disabling logic
* Disable only for MSVC which is < 2015 update 3
* Fix isEmpty test

Change-Id: I35b396f547d3a1e78713797266ede9f8fbbb9f72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-12-12 10:34:46 +00:00
Tim Jenssen
6bf4157491 CMake: fix not disconnected build action
The old code was disconnecting all signals from CMakeProjectPlugin
to m_buildTargetContextAction. The result was more and more triggered
actions.

Change-Id: I8d7db5852c03d5388870a7460efb3a8a28fd0749
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 10:20:54 +00:00
Tim Jenssen
b91632e642 CMake: fix crash while clicking context menu
It crashed if the root project had some error
and I tried to build a subproject.

Change-Id: I13dc620402a5f79e507e7da3fedb5eb09a4112da
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-12 10:20:35 +00:00
Tobias Hunger
a08a4a4842 CMake: Sort generator by name before displaying them
Task-number: QTCREATORBUG-17404
Change-Id: Ib20403a59bf01b71f0d317fc003d8484d215fcf5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 10:17:32 +00:00
Tobias Hunger
d25a12404f AbstractProcessStep: Initialize future interface pointer
Change-Id: I57d0ab6add9d0c3e325447dfc5a8dfe40dd3a770
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-12 10:14:25 +00:00
Oswald Buddenhagen
9ce62e5c8e fix coverity complaint the right way
use an assert to document in a machine-readable form that the file is
expected to be null-terminated. this supersedes 5a58e962's approach of
appending a null char, which would just obfuscate a problem in the calling
code if it were to ever have an effect.

Change-Id: Iaedb575d20abb42d98e011949e792ecf4dde3e93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 13:54:28 +00:00
hjk
52803f168b Add a few debugger related change log entries
Change-Id: Ieee586a9a67f72864c18ce2894964edcfbae8bdb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 13:52:28 +00:00
Friedemann Kleint
1ff72a5654 Add script to convert MSVC static analyzer results to task files
Add msanalyzer2tasks.pl, which does simple filtering on
the XML files.

Task-number: QTBUG-57086
Change-Id: I0ce0b1787aa54eac7cf6b3b9cdd258d5c9d62c60
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-12-09 13:39:32 +00:00
Ulf Hermann
b9a8bed037 QmlDebugger: Pass selected watch item as context to V4 debugger
Newer V4 debug servers will accept a "context" parameter which
specifies the ID of an object which is then used to look up a QML
context to inject when evaluating expressions.

Change-Id: I9d2a2226559380550308cacfe559e079291c14b5
Task-number: QTCREATORBUG-17177
Reviewed-by: hjk <hjk@qt.io>
2016-12-09 11:55:54 +00:00
Eike Ziller
0abd6dcd82 Merge "Merge remote-tracking branch 'origin/4.2'" 2016-12-09 11:42:58 +00:00
Eike Ziller
c175f1e62f Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
2016-12-09 12:42:01 +01:00
Christian Stenger
cdd94cbb02 AutoTest: Make results tree a real tree
Provide a way to control how the results tree will be
generated for the respective test framework and use
this information to construct a real tree.
Basically this changes the layout of Qt test results,
but keeps the former layout of Google test results.

Task-number: QTCREATORBUG-17104
Change-Id: I7fca4d8e365bfebcca4cf7855cf6a882e5379143
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-09 11:33:27 +00:00
Christian Stenger
5b6e9671d7 AutoTest: Small refactoring of addTestResult()
Just some simplifications and restructuring.

Change-Id: I2a2a66808f1721e7ce9dc47e20194d544c093092
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-09 11:33:14 +00:00
Orgad Shaneh
5071dd80cb QmakePM: Sort function keywords
They are searched using std::binary_search, which expects sorted input.

Change-Id: Ib2d59ab6e747e6ce36220dfd33dbe9bb145aeb92
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.2.0
2016-12-09 09:55:44 +00:00
Tobias Hunger
77b8198c2b RemoteLinux: Make sure there is a DebuggerRCAspect
Only offer to run runconfigs with the DebuggerRCAspect set, assert
that it is indeed there and never check for it again.

Change-Id: I5e9b329efb15d56ae221aed3ea2a75caa1078c18
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-09 09:52:10 +00:00
Christian Kandeler
4d34270874 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: Ifde10cab3dd3f93cd95a2cb72a9017866683802a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 09:50:32 +00:00
Marco Bubke
ce7e5e3b4d Clang: Temporary workaround for VS 2015 Update 2
We disable older Visual Studio compilers because they have bugs. This patch
has to be reverted after we go to VS 2015 Update 3.

Change-Id: I2c6eecab993282b24003ceb99a991a72502057f6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-09 08:04:42 +00:00
Vikas Pachdha
f32fbf5700 iOS: Fix app launch fail on debugging
Start the relay servers on the same port.

Task-number: QTCREATORBUG-17407
Change-Id: Iad22cdebffdf3e88021718d4a7c232e08650c92e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-12-09 07:49:41 +00:00
Christian Stenger
654a48b19d Clang: Fix logic to disable building clangrefactoring
Change-Id: Ib9b4cab728d6ee084c7693357f0bc9e5ff27f2ca
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-09 07:02:48 +00:00
Eike Ziller
5f054990d6 iOSSimulator: Try to avoid flakiness of starting in simulator
Put in some delays between executing the various simulator commands,
so whatever might need to startup internally has time to do so.

Task-number: QTCREATORBUG-17336
Change-Id: I1d4fbbc14c8583fce1b72ee31d5fd4824f377efb
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-08 15:29:11 +00:00
Ulf Hermann
97689ca9c2 RemoteLinux: Adapt to new PerfSettings API
Change-Id: If225c99a512ec36eb18149734dcdea5f41c790d0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-08 15:14:36 +00:00
Tobias Hunger
a2e3f716a8 QMake: Clean up Qmakestep
Change-Id: I3a2baa4e15a48f99652cec6151803f20341e339a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-08 14:16:53 +00:00
Eike Ziller
c226d311b7 Projects mode: Disable "Import" button if not supported by project
Task-number: QTCREATORBUG-17399
Change-Id: I79b64298c902776282d54d70efdc0eef03415a51
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-08 14:16:05 +00:00
Marco Bubke
1ae34549b1 Clang: Remove useless move
Temporary values are already rvalue references.

Change-Id: Iae3122cc04f6adb23fdf9986b9cdfe6575e906ee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-08 14:13:04 +00:00
Tobias Hunger
065f1562b3 AbstractProcessStep: Fix double-free of QFutureInterface
Partial revert of 732b832973

Change-Id: I22e1af3071b7345eae6459cfdfe5e3699f4ee804
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-08 14:10:41 +00:00
Christian Stenger
326845a8a2 AutoTest: Fix internal modification of data tag location
Task-number: QTCREATORBUG-17398
Change-Id: Ibd4cc52ce16d4b7b9adb0ec6f857f6b3ae17e703
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-08 12:35:28 +00:00
Tobias Hunger
8b9c6ba4b3 Core: Prevent possible nullptr access
I doubt that this can happen in practice, but better be save than sorry:-)

Change-Id: I30919e9ba16c2cc8cf401fc0c9f49267a215af71
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-08 12:17:11 +00:00
Marco Bubke
1f7694135d Clang: Workaround bug in clang for multithreading
We have to fix that but people want to try it now.

Change-Id: I957215c7ec05ec0b0632179b538f5fac41f77dab
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-08 11:57:43 +00:00
Marco Bubke
542c730b33 Clang: Suppress unused parameter warnings in clang headers
Change-Id: I8b2d50be5bda75b6759b7ce73b9d37b2500f3efc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-08 11:57:35 +00:00
Nikolai Kosjar
05942b63f8 CppTools: Do not put configuration document into global snapshot and working copy
These are remnants of the time when we had only one snapshot.

Change-Id: I6ff4db645d1065a0ef195834890e0774e2e2c60e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-12-08 08:52:17 +00:00
Nikolai Kosjar
3602033fca CppTools: Clean up ProjectFileCategorizer
Change-Id: Ia6954810ad49d43629be2db074d620ab71a09cee
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-08 08:35:42 +00:00
Nikolai Kosjar
4580e88cbe CppTools: Extract ProjectFileCategorizer
Change-Id: Ib7a5c3c61b0ea172cbc6a3ac7c94e77ffabc0db4
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-08 08:35:34 +00:00
Nikolai Kosjar
c961018a63 CppTools: Clean up ProjectFile
Change-Id: I01212115566c6bf26268b66fef96d50b7e93b96c
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-08 08:35:25 +00:00
Christian Stenger
832edfe12a Clang: Avoid passing unknown options
Option -Werror=date-time was introduced in gcc 4.9

Change-Id: I5be2100a2dc0a37d6a2e8c7b5c40f18bcdb0d3ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-08 08:18:56 +00:00
Marco Bubke
d451d52f6a Clang: Filter unwanted clang flags
We maybe need to extend the list.

Change-Id: I4615467a95985df9f6d0128223fb1aaad2561880
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-12-07 16:16:30 +00:00
BogDan Vatra
87b39ddd5a Android: Merge stdout & stderr channles
On Android 7.1.1 the error is fired on "stderr" on previous versions on
"stdout"

Change-Id: I72c06694a22084d455e26eea95ddfdb8a93a39b2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-12-07 15:37:03 +00:00
Marco Bubke
28a120b2e2 Utils: Workaround missing __cpp_noexcept in clang
Clang is not defining __cpp_noexcept.

Change-Id: Icb4e2dabb413e676614a9dd478e996d587c7f5d2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-07 15:25:58 +00:00
Marco Bubke
8c701f620a Clang: Fix warning
We can add it later again.

Change-Id: Ic75d05623cec0f9b0558495be5e1856ccf639c97
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-07 14:43:32 +00:00
Nikolai Kosjar
6b2270e178 CppTools: Clean up indentation in CppTools.mimetypes.xml
Change-Id: Ibe8c8b32f659156d9bfba7ec26e0ee2cd5b04f94
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-07 14:35:02 +00:00
Nikolai Kosjar
8916e81c4e CppTools: Make objective c extension *.m unambiguous
...and thus avoid reading the file.

The other candidate was "text/x-matlab".

Change-Id: Ifb36b817cda654bcda37b7d675c2df4e60525a2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-07 14:34:57 +00:00
Nikolai Kosjar
a80273edf0 QbsProject: Adapt assert
It fails now because with

    commit 521423b433
    CppTools: Call ProjectInfo::finish when we get it

the ProjectInfo is always changed.

Change-Id: I2c57cca330f42326d068e5077fc303d172b1be62
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-07 13:33:17 +00:00
Tobias Hunger
732b832973 AbstractProcessStep: Clean up code
Change-Id: Iae3d1e7cbd02d34da5cebbf0291948dbdd2e95df
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-07 13:17:59 +00:00