Commit Graph

48322 Commits

Author SHA1 Message Date
Marco Bubke
7cc348e048 Utils: Make SmallString(std::string) a template
Normal contructors are called before templated constructors. So it would
call SmallString(std::string("foo)) for SmallString("foo"). To prevent that
we change it to a template constructor.

Change-Id: Ibd249cedd638cbc2e6755c988be41fa5bb6e1ff6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-01 15:34: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
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
Tim Jenssen
e3a2f3c796 Tests: add utils dependency
Broke ConnectionClient compile which is using
isWindowsHost of utils.

Change-Id: I376efd5234a86de07764495af9a772b0810aaee7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-01 13:25:47 +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
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
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
hjk
f582c6a5a6 Debugger: Add a dumper for std::pair
Change-Id: I22b644dab9ed27d650b1e99e08f0335f7d265dfd
Reviewed-by: hjk <hjk@qt.io>
2016-11-01 08:14:23 +00:00
hjk
4f7821a71f Debugger: Disable Nim dumper auto test
Needs manual testing in the common case that the
intended crash does not occur.

Change-Id: I99de4f466df9e3a470a6bcb98b819d15da3a7067
Reviewed-by: hjk <hjk@qt.io>
2016-11-01 08:14:10 +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
Thomas Hartmann
f952c3ee4a QmlDesigner: Fallback to create types from source
We fallback to create types from source, if other means failed.
This can be required if the meta info is incomplete/incorrect when
a C++ type is mocked.

Change-Id: I50d45a6f9d7eba3483da10d9e1d7d6644d9aeb96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 14:30:40 +00:00
Marco Bubke
aa97e29920 Clang: Add ostream for clang::StringRef
Change-Id: Ibafb1c179fcc49f1df330537ad6dc9addba5618d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 14:23:44 +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
Ulf Hermann
d012e3e4bd Clarify section about broken performance counters on i.MX6
The performance counters are broken on most (all?) i.MX6 boards, not
only on the ones from Boundary Devices.

Task-number: QTBUG-56769
Change-Id: I9e0f291be7e00df3d9d1b98c7414dfd37e265b39
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-31 14:05:20 +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
Leena Miettinen
85bcb5b5c7 Doc: Restructure the Diff editor docs
Move the instructions for changing the default colors
to the end and add a section title.

Change-Id: I837e4d25a686d1bf7e9288a438f6321a9ae9d7ed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-10-31 12:00:04 +00:00
Leena Miettinen
5570798f54 Doc: Describe new Diff editor options
You can now view unsaved changes in the current file
or all open files.

Added a subtitle and moved the image to the new section.

Change-Id: I8135dc7c9e2edc60b88d84a241f6d959ba590464
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-10-31 11:59:53 +00:00
Leena Miettinen
f8cf53875e Doc: Describe adding vertical guides to QML Profiler timeline
Update screenshot and move numbers around, because the time
ruler was not described before.

Change-Id: I6e13269349b847249ff6b1a9d9c8062ed55bc7f6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-10-31 11:59:36 +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
Tobias Hunger
e6d553ce59 Wizards: Explicitly list sources in CMakeLists.txt
Task-number: QTCREATORBUG-17196
Change-Id: I478f2f945a6f7ee3183aa09871bccc7e475e5501
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:31 +00:00
Tobias Hunger
137695cae7 Wizards: Move cmake required version before project line
This is apparently necessary to establish policy before setting up
things.

Task-number: QTCREATORBUG-17197
Change-Id: I8b12e752e05e65b2275c0a97cf1b727f60c88cd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:25 +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
Leena Miettinen
75c5afef48 Doc: Setting when property for state in Design mode
Change-Id: I3462f7c5a8ea436d979c12bc02ae1e2f063eeb4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-31 07:57:48 +00:00
Rafael Roquetto
501bf4918f Fix CDB detection
To make sure CDB is really installed on a Windows Kit, we need to assure the
'inc' subdirectory is present. Before this patch, if, for instance, the
Windows 8.1 kit is present (including a Debuggers subdirectory), but without
CDB, the first test under "32-bit" qmake will yield a false positive,
preventing the following 32-bit kits to be tested, then to fail under the
64-bit qmake test because the 'inc' directory is inexistent, finally
bringing about an empty CDB_PATH variable.

Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-31 06:37:29 +00:00
Thomas Hartmann
2cab55ea1a QmlDesigner: Allow JavaScrip blocks in Connections in .ui.qml
Inside a Connections item JavaScript blocks should be allowed.

Change-Id: Ia6a08fc575a72980bd53a32249bf302b7a426266
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-10-28 14:27:58 +00:00
Christian Kandeler
11dd0f4c6f Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: Ideda150d8126e09fa105b3b85848f7af102a29d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-10-28 14:16:07 +00:00
Leena Miettinen
1562ec7bce Doc: Using code completion in Binding Editor in Design mode
Change-Id: I4889d6d247f6d8d8cb758c65eea917736f33262d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-28 14:11:31 +00:00