Commit Graph

40362 Commits

Author SHA1 Message Date
Christian Kandeler
0c22a610de Update qbs submodule.
To HEAD of master branch.

Change-Id: I6991c6dc4d39beb47dbf8b66e6dff7715369e765
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 16:53:08 +00:00
Tobias Hunger
3232af6272 DiffEditor: Fix selection of next view
Change-Id: I3754bb3637fc89d4c9ef2939db25dd1fda9d3243
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 15:02:29 +00:00
Tobias Hunger
f9f6f0b2c9 DiffEditor: Introduce a base class for the different views
... of the diff. Currently that is side-by-side and unified, just
as before.

Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 13:28:08 +00:00
Christian Stenger
7121315a71 Utils: Fix propagation of underlying tree model
Change-Id: I23739cb4c7a19a5c5bcdc8bf39c36db689292b62
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-23 11:52:56 +00:00
Thomas Hartmann
a2aaf0f6eb Fix assert for m_objectInstanceHash
The hash was not cleaned up in any case and sometimes a new object
gets allocated at the exact same address.
To avoid leaking hashes in m_objectInstanceHash and to avoid the assert,
we remove any deleted QObject from the hash.

Change-Id: I2697ab2b2430ad47932841fb9c0ef88ffa4cbbb1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-23 11:52:49 +00:00
hjk
54ce123a26 ProjectExplorer: Add runStartupProject() convenience function
The usage pattern seems to be used often enough to justify a function.

Change-Id: Iecdeb2b42879f419154902e685d0d13e8cae8b33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-23 11:01:56 +00:00
hjk
6fb766bf43 SettingsDialog: Modernize connections
Change-Id: Ie157b9b36a13b3e6eba5c158040e7491bd2ff29d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-23 10:54:39 +00:00
Christian Kandeler
1104a6602b Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: Ifce05da069397336b21081d797de07dcaf4d96fc
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 09:59:39 +00:00
Christian Kandeler
25a14aa2e2 RemoteLinux: Use QtcProcess::join() to display argument list.
Otherwise, we lose quotes on a round-trip.

Task-number: QTCREATORBUG-14002
Change-Id: If7ecd17dfcb310aa10d9f83ddbd215c5b7136546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-02-23 09:58:31 +00:00
Tim Jenssen
48cb9f124d improve process finished message
Change-Id: Id045df62c953954ae18d62c5f128d4ed46dc9aeb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-23 09:13:17 +00:00
Christian Kandeler
2244adcca8 SSH: Add support for SHA-256 HMAC.
As recommended in RFC 6668.

Task-number: QTCREATORBUG-14008
Change-Id: Icd4613dda9cce2b482499c626b863c17e8fa0c20
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-20 14:59:09 +00:00
Friedemann Kleint
143af2845d Fix excessive warnings by MSVC 2013 64bit about size_t->int truncation
C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data

Change-Id: I91979c685bbbd84359f7f4e19911a21a408f5d23
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-20 14:27:51 +00:00
Nikolai Kosjar
21e9893b4b CppTools: Fix completing qt5 style signals/slots in connect()
* Fix qualifying the member function, take namespace into account
* Fallback to usual completion if we cannot provide anything
* Ensure that the completion is not triggered outside connect() calls
* Change to a two step process:

    1. connect(obj, &         // offer class name completion
    2. connect(obj, &N::Foo:: // offer signal completions

  ...same for the 4th. argument.

Change-Id: Ifa4c74cde1b96ec7c544daaeefc47c4efdd8294a
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-02-20 13:11:17 +00:00
Orgad Shaneh
f3a2795c3b C++: Use correct features for document parsing
Task-number: QTCREATORBUG-8007
Change-Id: Ic96aaa433442812a99bac9d16bb9124d66762e8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-20 12:54:49 +00:00
hjk
97cbfb95bb Add manual test code to check generated code size
Change-Id: Idc65f441c3af09f1fcd5cff646cc7b472aed1770
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-20 10:01:09 +00:00
hjk
63247edd90 Analyzer: Reduce explicit use of RunMode enum
Change-Id: Idcdeb2b42879f419154902e685d0d13e8cae8b33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-20 09:35:27 +00:00
hjk
813e995ebf Analyzer: Reduce explicit use of StartMode enum
Change-Id: I27b1d06395dea940c8dd39cd2bd41fc09cee3a9c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-20 09:35:24 +00:00
Tobias Hunger
1eb36bb1d3 SVN: Save description as utf-8 string
We tell SVN that the file is utf-8, so we need to make sure we save it as
such.

Task-number: QTCREATORBUG-13979
Change-Id: I49edf477bf80c6b21cd99bc86fbd2555d7181a0b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-20 09:00:16 +00:00
Tobias Hunger
16f9e10e72 VcsBase: Make the description directly available in Submit Editor
Make the description directly available to subclasses of the submit
editor.

Change-Id: Ieb6f99091fdcb6f794491169e637bec53a04dacb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-20 08:59:27 +00:00
Tobias Hunger
541dde7ecc SVN: Remove commented out code
Change-Id: Ie1a3a73b553840a700e4c8dc229c6902afdafdc4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-20 08:22:35 +00:00
hjk
6c9ea34f9f Core: Modernize connections in ExternalToolManager
Change-Id: I1be66d132886da0b1bde4fe5578fc64bcd2f8e98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 14:09:53 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 13:35:45 +00:00
hjk
289e660fb7 Debugger: Simplify code to open disassembler view from context menu
Also, correct an off-by-one in column "computation" that always
resulted in "no function" here from the C++ model which assumes
column count starting at 1.

Change-Id: I9a34d4ffaaa25131d5a130c57ec10f1ce8e8a184
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:53:06 +00:00
hjk
50b3f7c69a Core: MainWindow code cosmetics
Modernize connections, namespace Utils, include order.

Change-Id: Ic2e414dd4fb55821c6314bfc5256ce166fd70c2e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:37:32 +00:00
hjk
aab3b6f816 Analyzer: Move isRunnable() decision to AnalyzerAction
Closer to where the information is.

Change-Id: I3ff7e933a99baf8a18e6532213aef0539a364a76
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:37:04 +00:00
hjk
9d707ac63c Analyzers: Various cleanups
Fallout after the demise of IAnalizerTool.

Change-Id: I68f936ed5f2929dc4f09a408bdf6b0ea38e568ef
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 12:36:52 +00:00
Eike Ziller
567c6eb875 Add changes-3.3.1
Change-Id: I56d0e82f69e604aca3dc65940218ed471d203516
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
v3.3.1
2015-02-19 10:16:46 +00:00
Ulf Hermann
8b8f8ca2ba Allow QML profiling when using Qt Quick compiler
Change-Id: I40784b51e36c3c77fce6bf077613d19579336db6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-19 10:09:07 +00:00
hjk
23ad61fc9d Debugger: Dissolve ConditionalBreakPointCookie structure
After dropping the QVariant cookies the structure is not needed.

Change-Id: Ib6f702bedeb250518ac0b7019e32d2caa62eb616
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-02-19 09:13:08 +00:00
hjk
c3184ee790 Valgrind: Simplify callgrind context menu creation
Change-Id: I5ea4bdf2dc6f4d3867e6abbc8d4cd6a1149a17b2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-19 08:55:03 +00:00
Thomas Hartmann
ee2a64d875 QmlDesigner: Fix clang warning
Change-Id: Ie783b8e32697a286cabbf25b06d06578d62a7340
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-19 08:18:31 +00:00
hjk
61cca902ad FakeVim: Modernize plugin connections.
Change-Id: Ia704aa975e64cc8942b4e5717f812b7c1a788096
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-19 07:22:32 +00:00
hjk
db8b2e8512 Analyzer: Use toolId instead of AnalyzerAction when sufficient
Less code.

Change-Id: I62ef8f9a87e57d109673bd7ae0ca945440961e78
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 15:31:04 +00:00
Eike Ziller
ee26bbc537 Mime types: Fix detection of Objective-C++ source files
Freedesktop has .mm as "Troff MM input document"

Change-Id: I9e06089a6054c3b771a1519918e0818265794136
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-18 15:27:19 +00:00
Eike Ziller
d877f0983d MimeDatabase: Prevent funny mixing of different mime type definitions
If multiple definitions for the same mime type are found, the mime XML
parser/provider would on the one hand replace the first MimeType instance
by the later one, but on the other hand keep all previously parsed glob
and magic matchers from the first definition.

The patch
- makes the XML parser ignore definitions of mime types that are already
defined
- parses custom types first, so custom types can override types from
freedesktop.org.xml

This fixes opening Cmake projects (CMakeLists.txt) in Qt Creator,
because freedesktop.org.xml defines these files to be x-cmake, but
we need them to be x-cmake-project.

Change-Id: Ia5598c2d0201f608aed6ae8c3268f0512d822f51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-18 15:27:02 +00:00
Tobias Hunger
839d226d70 QMake: Stop "Run qmake" from going MIA
... whenever closing all editors.

Change-Id: Ic7d09ef1260ab1ac826bacd60fdd705585e764b6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-18 15:10:29 +00:00
Eike Ziller
09716d64b3 MimeData: Never detect anything as application/x-zerosize
- That mime type is pretty useless
- If there are two mime types that match a file by glob pattern, the mime
database implementation will find the best matching mime type by data of
*all* mime types and take that instead (this doesn't make sense btw).
That means that if .h is matched by c-hdr and c++-hdr, empty .h files are
detected as mime type application/x-zerosize, which is pretty useless

Change-Id: I4f9d532ef1efd29df00279c693486c92611485a8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-18 14:52:27 +00:00
hjk
73e2b0c579 Analyzer: Dissolve IAnalyzerTool
Change-Id: I1fd90cf00d6b9dff54b4555a14747282830a4b93
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 14:52:07 +00:00
hjk
ca04d009f2 Analyzer: Move non-static parts of IAnalyzerTool::start*Tool
... to user code.

Change-Id: Ibe278134e39cfb3f90acedc976fab5e9dc019046
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 14:52:01 +00:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir.
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-18 14:49:06 +00:00
hjk
64be0004a6 Analyzer: Remove IAnalyzerTool::m_toolMode member
It's always known from the context when needed.

Change-Id: Ibf314dfb779190e89b775acab784ed71acff2c83
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 13:24:01 +00:00
hjk
e058dbe775 Debugger: Remove not-too-useful local typedef and typo
Change-Id: I260c06c32c1929953ae03a9c7cfec71e004a3c88
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 13:00:41 +00:00
Robert Loehning
baf62f94fb Squish: Remove outdated note about Qt4 from README
Change-Id: I0638a56d6bd833a6a7a97f7ebda7a99ab20e255d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 12:59:16 +00:00
hjk
35d3088252 Analyzer: Move runMode member from IAnalyzerTool to AnalyzerAction
Slim down tool before dissolving.

Change-Id: I502aaa8860293acf8bfd93f541b751d5b96a9563
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 12:51:52 +00:00
Oliver Wolff
a780ddc873 MSVC: Prioritize x86_arm cross compiler over x64_arm
Windows Phone and WinRT builds only support the x86_arm cross compiler.
With this change this behavior is auto detected by Qt Creator for these
builds (due to being higher prioritized). As soon as Windows Phone/WinRT
builds support cross compilation from x64, this change can be reverted.

Task-number: QTBUG-44530
Change-Id: I16ffe47c4582f51abdb6ef57b5922eb13863fd4e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-02-18 12:45:52 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-18 12:38:23 +00:00
Tim Jenssen
f160d2b8f5 add/use error channel puppet -> designer
Change-Id: Id6988e604ca3a092564a3e572c03b322bc101b77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-18 12:34:10 +00:00
Nikolai Kosjar
93c8509a50 CppTools: Tests: time out in waitForFileInGlobalSnapshot()
Change-Id: I0bf7d826d53749c5fd1be1e4f3c2faa403d13342
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 12:16:29 +00:00
Nikolai Kosjar
1e0b7e527f Debugger: Fix crash when hitting a break point
Change-Id: Ie1665f546ef683fc92a5a0cda20150886257844e
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-18 12:05:05 +00:00
hjk
da92b09969 Valgrind: Dissolve ValgrindTool hierarchy level
Medium term all *Tool should be replaced by RunControl(Factory)
to make the analyzer architecture more similar to Qt Creator core

Change-Id: I892cfc7fe45c73cc6ac4442a288810b83cb24c17
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-18 11:24:15 +00:00