Commit Graph

44349 Commits

Author SHA1 Message Date
Leena Miettinen
447a4a45b8 CMake: Fix UI text capitalization
"Generator" is written in lower case in the existing strings.

Change-Id: Ibef67f3f8c4a0aa5a0fa04f68e6b10fb2251d3ef
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 14:28:13 +00:00
Nikolai Kosjar
645f7fc85b Clang: Avoid parsing unknown gcc 6 asm output flags
Task-number: QTCREATORBUG-17183
Change-Id: I24321cd97acfa3dd71a3682f14af4816bdd08059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-01 14:16:11 +00:00
Tim Jenssen
cb3064a09e Clang: use a pri file to set clang defines
Change-Id: I52167ab3ce480c795cb0f0bcd749f97b34db86d3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-01 14:14:40 +00:00
Marco Bubke
a23f3c5e07 Utils: Improve test printing functions
Change-Id: I35df70a504f976422b6c05d4d60e7bc8d918ee1c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-01 14:04:56 +00:00
David Schulz
89fea59099 Debugger: Adjust cdbbridge to latest type changes
Change-Id: Ifa5edb490f12c302940d4f2101f9c297558a7cce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-01 14:04:11 +00:00
David Schulz
0a98e47e47 Debugger: Add a fake void native type to the cdbbridge
Looking up 'void' is known to cause hick ups.

Change-Id: I4c4b3bae5b5ac572404156edbd457003fbbf53f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-01 14:04:02 +00:00
Tim Jenssen
30a4c13d1d QmlJs: use contains syntax
Change-Id: I101292ab259fceda235ac017f812c4698fd7e484
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-01 14:03:11 +00:00
Tim Jenssen
9fab59ccb9 Utils: add widgets dependency
Was missing in a console only test.

Change-Id: I866d9ae8476431347fc4e0606871fd517fff0618
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-01 14:03:04 +00:00
Eike Ziller
242f9fce58 Help: Disable Add Bookmark action when current page is blank
Task-number: QTCREATORBUG-14204
Change-Id: I5d4a7ada10f0d69363e96bb4efd158444a051b71
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-01 13:44:04 +00:00
Eike Ziller
ad7ab4bee1 Help: Fix that sourceChanged was not sent when using backward/forward
Change-Id: Idc6ce63768bd77703149b5593f4ebabe88d1b033
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-01 13:43:56 +00:00
Marco Bubke
1cb16f98b0 Utils: Add += to SmallString
Actually it is a wrapper to append.

Change-Id: I61112a432423d0fcd3917aa28ea4cdc4842d51d4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-01 12:56:27 +00:00
Tobias Hunger
80a58ba1cb CMake: Fix pipe name on windows
Fix the name of the pipe used to talk to cmake-server on windows. The name needs
to follow a very specific pattern there.

Change-Id: I2789be43b374d008e2bf784563ab362efd891e59
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 12:29:34 +00:00
Marco Bubke
c56f3f235b Utils: Remove noexcept from SmallString constructor
Change-Id: I561b523bfac91098f721a5d53806670a3b682514
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-01 12:25:45 +00:00
Nikolai Kosjar
2a06b94c4a CrashHandler: Fix warnings about unused parameters
Change-Id: Ia5755eaf3af739a9f8f71b44c26170ca2cac740c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 12:24:49 +00:00
hjk
5a9b6bb694 Debugger: Shrink location marker in breakpoint and thread view
Fixes a recent regression.

Change-Id: I4202ec62c9fa165e7f602c11a92eb1bf8bbe73f0
Reviewed-by: hjk <hjk@qt.io>
2016-11-01 12:22:39 +00:00
Eike Ziller
644756d80a iOS: Make updating available simulators asynchronous
Also remove unneeded lock

Change-Id: I8db798bd0b8790ced198cf57e30e22a96a0eb0a2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 11:54:43 +00:00
Eike Ziller
85e8bdb3ba iOS: Remove unused signal
Change-Id: I1d949b01f93485a12bd37142cea02f5b96b7acbb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 11:54:19 +00:00
Marco Bubke
87899bf705 Core: Fix IFindFilter::defaultShortcut() in wrong cpp file
Change-Id: I4393dbb059454333ef98a0749a3f0176557a2f5e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-01 11:16:48 +00:00
Eike Ziller
5b3aa93320 CppFindReferences: Simplify code
Get rid of the need to manage a map of QFutureWatcher -> SearchResult

Change-Id: I1a87eccfff9149f2ddfdd2f72bb5e4b07ee81ce3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-11-01 11:01:33 +00:00
Nikolai Kosjar
a8456c16e8 Clang: Avoid parsing unknown __builtin_va_arg_pack
Task-number: QTCREATORBUG-17185
Change-Id: I72552bcd417c9760413b772593642e3c79f1ab17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 10:44:35 +00:00
Nikolai Kosjar
e1921741af Clang: Use CrashHandler for clangbackend
Change-Id: Ic51e9c3227744fa087ade4bde9a7b5f421024f6f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 10:11:08 +00:00
Orgad Shaneh
9ac8572b29 QbsPM: Store unexpanded values in build configuration
Expanded values are stored permanently, so the next time the project is
opened the variable usage is gone.

Change-Id: I9787b343e9856e12e296271674b3b8827041e477
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 09:54:50 +00:00
Nikolai Kosjar
69555ec851 CrashHandler: Generalize for other clients
* Put the binary into the libexec path
* Check for process origin more explicitly
* Allow providing the application name
* Allow disabling the restart action

Change-Id: Ide7132215d7c251ce486daab60ac680de3c9f9a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 09:33:33 +00:00
David Schulz
a1b0302014 Debugger: Add debug messages to the cdb python module
Change-Id: I53f9df68ff7918f63ffb10b8d80192c78cad3cb3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-01 09:10:16 +00:00
Eike Ziller
30f71eddf8 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I245212bd45104636b1c9737b36d3db3e4af23092
2016-11-01 09:30:49 +01:00
David Schulz
36bb2841af Debugger: Fix target type for arrays in cdb python module
Change-Id: I716d4993c6cb5c4e4537a92438d768eabc0450cd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-01 08:30:49 +00:00
Oswald Buddenhagen
fde9758fcb prune dead code surrounding isDeployable
no-one ever queried this state since S60 support was removed in
ae23d50576 (2012).

Change-Id: I3e05d90bb43514b4c326e124834cf9c5e89a0168
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 07:58:03 +00:00
Oswald Buddenhagen
3c43c35167 remove pretenses of support for DEPLOYMENT with .sources
since fa6d0f1231, DEPLOYMENT is aliased to INSTALLS, so we would have to
actually look for .sources in entries listed in that variable, which we
didn't. apparently, nobody noticed, among other things possibly because
the qt4 variant already supports .files in later versions.
also, our actual deployment code doesn't use .sources, either.

Change-Id: I990240716817118047fc9aa97eff55305fcf7eca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-01 07:57:48 +00:00
Eike Ziller
2d6f33a92b Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ic536dc74b969dce910ec6b91e5a308e97348b8bf
2016-11-01 08:44:04 +01:00
Orgad Shaneh
b4e8dba26a CMakePM: Fix compilation with Qt 5.6
Change-Id: I9c1b924c29b6f1531322987ce77a577353aea300
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-01 06:17:36 +00:00
Lorenz Haas
49c6710b42 CppEditor: Fix GenerateGetterSetter for reference types
Change-Id: Iad332cf023c6bff0c7f5ae46fb56f0393c9c7b29
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-10-31 16:00:17 +00:00
Tim Jenssen
0e7fc0ef2e Core: fix warning in reaper
Change-Id: Ie8be62619d7092982f8e6c8e46e6b019730f2b42
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 15:50:52 +00:00
Nikolai Kosjar
6e6d5b5309 ClangStaticAnalyzer: Tests: Rely on projects telling when they finished parsing
We relied on the CppModelManager to tell us whether a project was reparsed
after a kit change. While this worked, it was not guaranteed that the project
is really finished (and ready for e.g. building) after pushing new ProjectInfos
to the CppModelManager.

Rely on the projects telling when they are finished with parsing. This is more
accurate and future-proof.

The introduced signals in Project and SessionManager are (at the moment)
only for tests.

Change-Id: I1b368ec4585ffa8755eb28fac6d187cce31243ee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-31 15:09:01 +00:00
Eike Ziller
457cfcfae9 Welcome: Fix that filter string was cleared when changing page
In examples and tutorials pages.
Since the pages are unloaded and loaded again when the tab changes, they
loose their internal state and require the search text to be kept as
state in the model (which makes sense anyhow).

Task-number: QTCREATORBUG-15901
Change-Id: I4fb05ca47f8337008c51e17cc95962a5e9e67fef
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-31 14:18:10 +00:00
Orgad Shaneh
4325f4facb QmakePM: Avoid soft assertion
... when a matching toolchain is not found.

Change-Id: I901bdb51f98a88b2402b12309a05e0bc5ffcaa3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 13:46:23 +00:00
Christian Stenger
cff2ee701d ProjectExplorer: Fix compile with Qt5.6 / gcc 4.8
Change-Id: Id1ded1679e9cde4e9cabba61dc5e6aa7aea1e7ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-31 13:21:31 +00:00
Tobias Hunger
0c0c0a6fd0 Jsonwizard: Modernize JsonFieldPage elements
QTCREATORBUG-17190 is fixed by this since initialization is fixed as a side effect;-)

Task-number: QTCREATORBUG-17190
Change-Id: I9d1f81d6cca26fcdd9ba8a49ee66e05607d6cae1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-10-31 13:04:03 +00:00
Tobias Hunger
ea44a2ce4e CMake: Force reparsing of cmake projects
Change-Id: I2f309e38e99a7b5836c623995e71470e7161ee98
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:51 +00:00
Tobias Hunger
6ad21cab82 CMake: Small updates to tea leaf reader
Change-Id: Ie68ed562415ee0024254729ea95591b59bb8f0cf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:39 +00:00
Tobias Hunger
73dee5193c CMake: De-noise TeaLeafReader
Change-Id: I387bf0e1cc123d78591f95aacecb7be05c7455c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:34 +00:00
Tobias Hunger
36cfa32a86 CMake: Use ServerModeReader to retrieve data
Change-Id: I415dbf7ca79c909eea23ef3dc3a1d87438e9f261
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:27 +00:00
Tobias Hunger
c75210034c CMake: Implement a reader that interacts with CMake server mode
Implement a reader that interacts with CMake server mode to retrieve
its data.

Change-Id: I4146a648475c2c5811b8a08126f10ff3b99e79f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:21 +00:00
Tobias Hunger
e3c1e7ade3 CMake: Unify mapping of type strings to CMakeConfigItem::Type
Change-Id: I29b905aac8965039369891e6aad7e356fa1dad8f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 13:03:08 +00:00
Tobias Hunger
4c1a7515c9 CMake: Implement helper to talk to CMake server-mode
Implement a helper class that can be used to talk to CMake's
server-mode.

Change-Id: I1df4af665991a5e0a3acb301ffd28008dd4fe86f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:40:37 +00:00
Tobias Hunger
9a980adf3c CMake: Implement different backends to run cmake
Only the original one is implemented so far, but at least
in theory backends for retrieving data from cmake can now
be switched at runtime.

Change-Id: Id73a81c7d40f078be95defd30a38511dca3a3720
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-31 10:40:24 +00:00
Eike Ziller
f1d3e7c8e7 runextensions: Add convenience method for result handler
Change-Id: Ibe7e62049f165276fdedcd04d8311324f6bc5d19
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 09:31:02 +00:00
Christian Kandeler
f87362990a Update qbs submodule
To HEAD of master branch.

Change-Id: I8aff6a4685fc5f900037e5703b6c2f00b1996ff4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-31 09:28:50 +00:00
Orgad Shaneh
36ecee17fe MSVC: Register toolchains also for C language
Change-Id: I1abaecc53be9e87b88178bc044e3352ddeb5c4e6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 09:27:20 +00:00
Orgad Shaneh
a9c967263e MSVC: Minor cleanup
Change-Id: I4aa9684e04e57a96c3fc624236c2c95817306d76
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 08:52:42 +00:00
Orgad Shaneh
1d6d799d22 ToolChain: Compare also by language
Otherwise C/C++ with the same ABI are detected as duplicates.

Change-Id: I99090b4cc776047b1ecb958242d0b4f5ecec5f0a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-31 08:52:36 +00:00