Commit Graph

43086 Commits

Author SHA1 Message Date
Nikolai Kosjar
d8f119c8a2 Clang: Allow to provide extra command line options
This can be used to experiment with clang options that e.g. affect
diagnostics.

Changes take effect on editor re-open.

Change-Id: Ie46d0ff085a3700a748dbcf4b94b93b0bf9c4642
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 15:14:56 +00:00
Nikolai Kosjar
72785e3a11 Clang: Activate the code model with a check box
If the plugin is not activated, show a hint.

The underlying settings are still mime type based. This will be
addressed in a follow-up change.

Change-Id: I24b232365d505a0022a78e96eb496d219a8b7c5b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 15:12:19 +00:00
Orgad Shaneh
942aa12f77 JSON: Fix MSVC2013 warnings
json.cpp(221) : warning C4800: 'uint64_t' : forcing value to bool 'true' or 'false' (performance warning)
json.cpp(322) : warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning)
json.cpp(756) : warning C4244: '=' : conversion from 'int64_t' to 'double', possible loss of data
json.cpp(953) : warning C4244: 'return' : conversion from 'const double' to 'int', possible loss of data
json.cpp(4408) : warning C4244: 'argument' : conversion from '__int64' to 'int', possible loss of data

Change-Id: I2a24f90f7615aeb47f747ecbe3b580f23773ebda
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-11 14:04:02 +00:00
hjk
0f9e2baa1b Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit
Change-Id: Idb14d81aa3546af0e7a21922fbb6d551ecbc1b06
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:57:37 +00:00
Orgad Shaneh
1fd8760789 Git: Do not use file name when retrieving parent commit
Right-clicking a commit on blame shows the parent commit relevant for this file.

In case the file was renamed, fetching the parent can fail (since the file with
this name did not exist before the requested commit).

Using the direct parent is good enough, and should work for all cases.

What the user is really interested in is "how did the file look before this
commit", and the exact "previous" commit is not really interesting.

Change-Id: I7d74efce5f2b065f62e978ba5f14d3010a5f2c7f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 13:24:06 +00:00
Orgad Shaneh
bd858d9753 Git: Mute commit description fetching on right-click
Change-Id: I7f7b1b1cdc4e557748b4c9781c96be65f57156e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 13:22:56 +00:00
hjk
aa221121b6 Debugger: Pass down expanded inames in LLDB tests
... as well as the 'autoderef' flag. A lot of dumper tests were
failing even though the dumpers themselves were ok.

Change-Id: I198784d95eb0004e81bfab995121e048b1722c66
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:16:17 +00:00
hjk
aed9c46ea6 Debugger: Try to handle empty base classes more gracefully with LLDB
Empty base classes are counted towards GetNumberOfDirectBaseClasses()
but do not get reported in GetChildCount(). Fix the difference by
manually creating empty base class entries in the report.

Change-Id: I2650d9f5234302c5bf2fa0e62a886d3a39fc11db
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:11:32 +00:00
Tobias Hunger
1fc570acb7 Kits: Do not lose toolchains when using SDK-provided kits
The observed behavior is:

The first time you open Qt Creator from the Qt 5.6 package you get
the kit for the installed Qt version with a toolchain. The next time
you start the toolchain vanishes from the Kit.

Surprisingly nobody reported a bug about this:-/

Change-Id: I49545e11f02eadb73f583b134d9eadfc2adf3bec
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-11 10:31:58 +00:00
Nikolai Kosjar
4d1a1981a8 CppTools: CompilerOptionsBuilder takes project part by reference
...since it assumes a project part != 0 and does not participate in
ownership.

Change-Id: Ia9c1eca52776990576a2dac61e9144234b04c59c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-11 09:51:19 +00:00
Christian Stenger
340572c980 Scripts: Fix deployqt
When comparing re.MatchObjects instead of real bools the objects
normally aren't identical.
This lead to filtering out all libraries and not copying anything
to the respective directory.

Change-Id: Ib17cc04d281620b142ac570475d8fdc4912eaa86
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 09:22:25 +00:00
Christian Kandeler
21ad1804f6 QbsProjectManager: Fix soft assert.
Change-Id: Ic970642aa37d0983b41b7be6459140bcc2f6ed42
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-11-11 08:52:12 +00:00
Christian Stenger
66c2ba6076 Json: Fix compile for MSVC2013
Change-Id: I5266165c64bb4c1bdb75ac04f9a5fadb6d97e6ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-11 07:45:39 +00:00
David Schulz
90ed0cf793 Debugger: Remove unused setting ListSourceFiles.
Change-Id: I4c60dcbf29ac050cdead98f2c58c204e3ffbab0a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-11 07:35:33 +00:00
Niels Weber
58804ad823 Fix two typos in comments
Change-Id: Iacb728715b11ca3a9f82d82cca49889eea9dd59b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-11 06:56:08 +00:00
Eike Ziller
e891a56f04 Keyboard settings: Make it possible to filter whole command id
That makes it possible to filter "TextEditor" and get all text editor
shortcuts.

Change-Id: I0b02f638c7a3ef144f997fdd4c6083c59d819ac9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-10 16:27:04 +00:00
Friedemann Kleint
9c945faa20 app: Use HighDPI application attribute instead of environment variable.
Set Qt::AA_EnableHighDpiScaling introduced in Qt 5.6.

Amend change f4e5210cda which apparently
was broken by qtbase:add58edcdbd986e68cdd65a2a935b76d85d5b639.

Change-Id: I0a9337f17b02704e36915f78b1321287e4112378
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-10 15:12:12 +00:00
Leena Miettinen
2a42ad08a3 Doc: new build options
...for building and cleaning projects without
dependencies.

Change-Id: I910b6028c210478e954636d101f37bf1898bbcad
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-10 13:49:54 +00:00
Leena Miettinen
1804d89842 Doc: update instructions for creating custom buttons
Use the Connections view to create connections, bindings,
and properties.

Change-Id: Ib879c5d95a2026bf59bfb1b7a02d0c8a10658c2f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-10 13:44:03 +00:00
Leena Miettinen
17b892f8f3 TextEditor: rename "Files on File System" as "Files in..."
The current actually means "files about the file system".
Yes, I know it has been there forever and a day :).

Change-Id: Ica99118b902c9ba08a1434fc97820348b3312a87
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-10 13:37:23 +00:00
Eike Ziller
7e453d0ef7 sdktool: Fix settings location on Windows.
Broke when fixing the location on Linux.

Change-Id: I704773a255cdc1eea77aa234ab6f710d264720b0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-11-10 13:31:11 +00:00
Leena Miettinen
5c70775ed7 Doc: update mobile app tutorial to use UI forms
Added the main.cpp file and .qrc file so that the example can
be built and run without modifications by users.

Change-Id: Ie74f78102d16b5a514f4c6156ea0558c157c0444
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-10 13:03:23 +00:00
Martin Kampas
435682d702 Core: NewDialog: remember platform choice
Change-Id: I7e1e099cdd2997c1264e9fe5cbef5d4a5adbf791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-10 12:22:59 +00:00
hjk
45b08e21a2 Debugger: Fix QHostAddress dumper with Qt 5.7/64 bit
Change dd920024 in QtBase introduced padding in the QHostAddressPrivate
structure.

Change-Id: I92292937cf7bdd539764f52c18b70d926e39cf29
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-10 12:12:24 +00:00
Eike Ziller
10fb3ead23 Fix that bogus mime data could lead to endless loop
<mime-type type="text/foo">
  <sub-class-of type="text/foo"/>
</mime-type>

Change-Id: Id03cb4a37345ccc083eaaa03c33847b3735a5d4b
Task-number: QTCREATORBUG-13965
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-10 11:28:02 +00:00
Eike Ziller
b747345916 Locator: Do not loose focus on active window change
We cleared focus on the locator input when it lost focus because the
active window changed, so the popup is not reopened when the Qt Creator
window is activated again. Instead keep the focus in the locator input,
but do not open the popup if the focus comes back to it because of an
active window change.
Then we need to make sure that the popup is always opened when
explicitly requested through show(...).

Change-Id: Icd78673bece542ae78340b2ab6aa7834d700a3b7
Task-number: QTCREATORBUG-13548
Task-number: QTCREATORBUG-9953
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-11-10 11:27:00 +00:00
Tobias Hunger
f6056a024c Dependency Panel: Update UI texts
Update UI texts as suggested by Leena

Change-Id: I5baa7400f0755fad57b908b0bd7330c2bbb94a1a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-10 10:10:43 +00:00
Leena Miettinen
fa74c127aa Doc: new CMake build configurations
Change-Id: I8bca2a067231a6aff499ede62cb2cf23175c0ee1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-10 10:02:12 +00:00
Leena Miettinen
5e0883428a Doc: synchronizing configuration between projects
...loaded in a session.

Change-Id: I326bee589fc1d2ad4465050267715291a65f4f28
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-10 09:58:39 +00:00
Eike Ziller
1302b8bbe7 Fix that there could be many "fading indicators" painted over each other
Simply hide the current indicator, if there is any.

Task-number: QTCREATORBUG-14805
Change-Id: Ic25ba1b671e6ba2490803ba73b8a5757ccbff24b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-10 08:35:04 +00:00
Christian Kandeler
7130ea7d83 Qnx: Fix qbs build.
Change-Id: I38946bc418769ce48f3226830975ddb0e0ff192d
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-11-10 08:19:32 +00:00
hjk
64426fb772 Debugger: Adjust boost::unordered_set dumper
... to Boost 1.58

Change-Id: I5656e0c32e1f7df0b2b74a2f9ad7d468997a8904
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-10 07:57:23 +00:00
Leena Miettinen
faf609da96 Doc: editing CMake configuration files
Change-Id: I46f7f55939df9efb090642c979db349ea772cef1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-09 16:10:28 +00:00
BogDan Vatra
aaaef7d1b2 QNX: Export QnxDeviceConfiguration
Allow other plugins to use the existing Qnx device implementation.
Move QnxDeviceProcess into separate header/source files.

Change-Id: I3fe62aefbe8a71adf75acfc1a2c0c8ac1cc3d1e1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-09 14:55:54 +00:00
Niels Weber
2dc660e698 Silence a warning
Commit 11f6162739 removed
the usage of userProvidedTheme leading to "unused variable"
warning. Remove last traces of userProvidedTheme.

Change-Id: I187d7ac335ec659a5e8a52e38ffe075a98446586
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-09 14:34:54 +00:00
hjk
e6454be43f Debugger: Fix QObject dynamic property dumper for Qt 5.7
Property values are stored now using a QVector, not a QList.

Change-Id: Ifc8d6b856d2aff5ce4565c43111132f2a73460df
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 13:49:34 +00:00
hjk
d6bb579a41 Debugger: Fix QAtomic* and QShared* dumpers with Qt 5.6/C++11
With C++11 we use std::atomic in the ref counter, giving yet
another possibility of structure member names. Instead of
trying to keep up with that, access the binary data directly.

Change-Id: I572f727eb9dab37ac1ca07594d55bea723050817
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 13:49:25 +00:00
Thomas Hartmann
b6f56812aa QmlDesigner: Allow to add import from Qt.labs
The new controls are in labs.

Change-Id: Ic46631b6dc20f82697a944a2336c73b72e52359b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-09 13:40:59 +00:00
Christian Stenger
9ce0c9cd1e Tests: Provide basic boost version check
Change-Id: I38e38fdb129c172cb0056b6f96146a7e29d7288a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-09 12:50:52 +00:00
Christian Stenger
e7df1233f0 Tests: Provide way to specify boost library include path
Change-Id: I162343f188c5f9c8849d93faf120a424ec41e6f8
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-09 12:50:45 +00:00
Nikolai Kosjar
641abf3e56 Clang: Update the fallback project part
Change-Id: I1dfbb32246798a402a1efe18529e95d6199ba942
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-09 12:11:35 +00:00
Nikolai Kosjar
9d7b054120 CppTools: Fix potential race condition
...when acessing m_headerPaths, m_projectFiles or m_definedMacros from
different threads.

ensureUpdated() locked the mutex before writing the variables, but
reading them happened with an unlocked mutex.

Change-Id: I4951fd58f1939e4e50534a018dd600004789668e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-09 12:10:14 +00:00
hjk
4bf0ca6beb Json: Avoid unneeded intermediate copy of key strings
Change-Id: Ieb2401810e4b47fab77b287e50e13b33160a9297
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-09 12:09:26 +00:00
Leena Miettinen
309b2b843c Doc: context menu commands in the Navigator
Change-Id: Ibfe6702d410b13936e9512c22539c4b76efce839
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-09 10:47:10 +00:00
Tobias Hunger
34b99de5b1 Wizard: Always prefer context node
Always choose the context node as the project node to add the new
file(s) to. This fixes adding new files to resource files.

Task-number: QTCREATORBUG-15277
Change-Id: I27f6d9dbb402c88413570a8198a005496f103c7b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-09 10:35:19 +00:00
Christian Stenger
8cdc648139 Tests: Fix compilation
Change-Id: Ia63f3afd7ae3e76f78ffea31702ba5968b74b418
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-09 10:11:49 +00:00
hjk
a4a9529403 Debugger: Make boost::container::list autotest pass again
... by adjusting the expectations on the exact type display
and trying two possible versions of structure member names.

Change-Id: I817aeb787b905cb22c6f68856043a29db3e79e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 10:08:20 +00:00
Eike Ziller
7be5ef0f5c At close: Fix that editors were removed even when canceling
Because the editor manager was asked first if it wants to
abort closing (because closing an editor failed), editors
were closed before any other close listener was asked.
Ask the editor manager last to avoid ending up with an
empty editor list when canceling for some other reason.

Change-Id: Ie56866cb668a717b7072d8092b4d86b7b3196d01
Task-number: QTCREATORBUG-14401
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-09 10:03:46 +00:00
hjk
f81dca4b38 Debugger: Relax reference counter sanity check
With C++11 we use std::atomic in the ref counter, giving yet
another possibility of structure member names. Instead of
trying to keep up with that, access the binary data directly.

Change-Id: Iabea831689f58f83150287218bb015c824e888ca
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 08:44:58 +00:00
hjk
b8a8fe34a2 Introduce a Qt-free JSON implementation
This is essentially QJson with Qt replaced by std:: features.

This is useful to have in circumstances where a Qt dependency
is undesirable, e.g. for the Qt Creator debugger protocol
implementation in our CDB extension.

Change-Id: Iec79c6b23b1e717ce1b6f4d38755287d1f479c13
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-09 08:25:11 +00:00