Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
b31c408c87 ProjectExplorer: Check before setting errorMessage
Change-Id: Ic9437c3527f4f26bf72c5f7d18fdbde1217f4dd4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:41:55 +00:00
Tobias Hunger
5bd68d6773 QmlDesigner: Prevent possible nullptr accesses
Change-Id: I4b271e7672452473d4587b49bb368aa57f7e47ca
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:38:09 +00:00
Tobias Hunger
9801472d33 CMake: Fix potential nullptr access
Change-Id: I08bcbde9702bb9bea5fe4f24247eb3856e79f339
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:36:10 +00:00
Tobias Hunger
c4ff03d8b5 QmlDesigner: Prevent potential nullptr access
Change-Id: Ia11e0968bfc1368e3485a4b5f0d0ea0fa95a7a3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:27:33 +00:00
Tobias Hunger
d88ba65a57 QmlDesigner: Prevent possible nullptr access
Change-Id: I1d101f5ee99db9c0fedae02a0cb23be1da22ffe1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:27:08 +00:00
Tobias Hunger
423ac2d32b ProjectExplorer: Fix potential nullptr access
Change-Id: I3469643c9744b33cafb4242709f843b8b700f9ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:26:19 +00:00
Tobias Hunger
9c05baaf57 QmlDesigner: Remove unnecessary nullptr check
Change-Id: I056a761d8fa0a3725bd3ebab7dd0ec022e1c6584
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:25:25 +00:00
Tobias Hunger
2044c834d2 Modeling: Fix potential nullptr access
Change-Id: I9b8fa7de10e7fbe089c9bdde6d9f42c427ca8f82
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:14:31 +00:00
Tobias Hunger
2ce647f885 ProjectExplorer: Fix potential nullptr access
Change-Id: If5e4a9b3ba3eb25549406be76c5f14e2479b7cf4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:11:46 +00:00
Tobias Hunger
fb78c31192 TaskList: Initialize members
Change-Id: I4f3b3d9382215c832a1baf5adad60901800650e4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 18:09:17 +00:00
Tobias Hunger
e903a5871a ProjectExplorer: Remove unused members
Change-Id: Ie0076278ed30c70d4731dd67d1f58635d46153ab
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 17:57:21 +00:00
Tobias Hunger
e58020c346 Utils: Do not dereference nullptr via errorMessage
The errorMessage passed into this function apparently can be a nullptr,
at least everywhere else it is checked whether or not errorMessage is
nullptr before accessing it.

Change-Id: If0920275ebce394a1b7085b815eaa6994b76ee3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-05 16:32:07 +00:00
Tobias Hunger
e492ee2b14 Core: Simplify code in ModeManager
* Fix a possible nullptr access while at it.

Change-Id: I24ba1d5ebf9873059526aa8cf7974960c6fd4c8a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-05 16:22:04 +00:00
Tobias Hunger
45ad669a88 CMake: Return empty tree on errors in server-mode
This triggers the fallback mechanism which will make sure the CMakeLists.txt
file will be displayed.

This used to fail since one empty folder was left over in the project.

Task-number: QTCREATORBUG-17383
Change-Id: I867fd9039bc5df805ff5174ec49084bbcf688824
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 16:21:30 +00:00
Tobias Hunger
7e10f84c2e Utils: Simplify code in Wizard
Change-Id: I79056601c9819ba127c186132557c3310a5754a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 15:55:53 +00:00
Tobias Hunger
eaa12ce515 Utils: Polish
Change-Id: I90d2a53e013ca78e14f23a19a11f5ebd73b74d96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 15:21:00 +00:00
Tobias Hunger
1f69d6e0c4 QmlDesigner: Fix logic bug
Change-Id: I33f497afa40606aba5538c52f47787dcca84d78b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 15:19:33 +00:00
hjk
b662a59437 Core: Make initial default window wider
The new project window works better with 1280 pixel. Assume that is
a good default width in 2016.

Change-Id: I0c96db1bd279f6587e69c36ca01d1cd4f5243769
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-05 15:18:40 +00:00
Tobias Hunger
059d060dfa WinRT: Use member initialization
Make sure m_process is initialized while at it.

Change-Id: I2a06bc265cb8e6988ef1985a788b33989ae4c0b0
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-12-05 14:54:53 +00:00
Tobias Hunger
84d4b13899 Utils: Reduce padding in HistoryCompleterPrivate
Simplify code and make sure to initialize all members while at it.

Change-Id: Id9cfbcd1f78fd00391fecc4e767affc56b60f3ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-05 14:54:35 +00:00
Marco Bubke
b8e391e5f0 Utils: Fix SmallString reserve for read only references
The capacity of a real only reference is zero but the size is larger than
zero. So if we reserve memory the new capacity has to be bigger than the
size and the capacity.

Change-Id: I8b423da7e7c1cf7cee081d1b3f3464b6fb3f67cf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 13:59:56 +00:00
Tobias Hunger
a290850afc Debugger: Remove useless nullptr check
Change-Id: I4b05573276a1372a1f238fbe1cdd9ee67add7158
Reviewed-by: hjk <hjk@qt.io>
2016-12-05 13:46:25 +00:00
Tobias Hunger
9dab028fa8 TextEditor: Initialize all members
Creator can start to shutdown before initialize is called. This should
be safe here right now, but let's not take chances in case somebody
refactors this later.

Change-Id: I961c215b8dffc92cf90d9f83e91b0b3034772077
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-05 13:46:10 +00:00
Tobias Hunger
87b29eeaad TextEditor: Initialize all members
Change-Id: Ibbed17b353dfef8b9aedbcd1860b862825b947a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-05 13:45:56 +00:00
Tobias Hunger
c25a56dc07 WinRT: Initialize m_deviceId
Change-Id: I16ef289f21b9c7a925bf16f8560d07fed4206bd2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-12-05 13:45:41 +00:00
Tobias Hunger
85115d486a Debugger: Initialize members
m_toolbarDock was only initialized in finalizeSetup, which is triggered
by the plugin's initialize() method. This is not safe since Creator might
shut down before that method ever gets called.

Change-Id: Idadb6ac943ed6799d1bd9db1ecb884cb39038389
Reviewed-by: hjk <hjk@qt.io>
2016-12-05 13:19:40 +00:00
Tobias Hunger
15cad7dec5 FakeVim: Initialize pointer
Change-Id: Icfb7f733f41593aef09c71d5f8f13f8c453c7cd6
Reviewed-by: hjk <hjk@qt.io>
2016-12-05 13:19:22 +00:00
hjk
6d9afdc4ff QmakeProjectManager: Compile fix after ebf8c1eaf0
Change-Id: I4e1315dd7b1cdc11a355330dcad653667967ec8d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 13:18:35 +00:00
Tobias Hunger
b002e87ca4 Designer: Avoid some useless type casts from unsigned to int and back
Change-Id: Ia3b270f8ad4f3857085f1e42155972d909713c16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-12-05 13:13:10 +00:00
hjk
4b661c3130 ProjectWindow: Delay panel update after target adding
Parts of the machinery are not yet done when the signal
arrives, waiting for next event loop iteration suffices
to get a context enabling us to show the proper panel.

Change-Id: Icbf33a4f5a900058ecc89ac125eb43313e12b74f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 12:26:25 +00:00
David Schulz
c8215d4b6e Editor: Fix search result backgound for declarations
Don't add a background to a format without a background
if a mixin is applied.

Task-number: QTCREATORBUG-17314
Change-Id: Ie76fe7f69e98e9cfdfa290c40f0774dbe6f86cea
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-12-05 12:26:06 +00:00
Tobias Hunger
8f4c2c186f ProjectExplorer: Fix error reporting in customwizard
Change-Id: I8165c16280a11b7ea212123b4aff14ed95f440d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 12:10:57 +00:00
Alessandro Portale
ebf8c1eaf0 QmakeProjectManager: Use "Default encoding" for mechanized editing
When performing mechanized editing on .pro/.pri files, until now, Qt
Creator reloaded and restored the file with [from|to]Local8Bit.

That broke #comments in unicode.

This change implements that the the "Default encoding" from the text
editor options is used instead.

Task-number: QTCREATORBUG-10274
Change-Id: I783fc3a2c6a2638e4603ced2eef25c2a3998e2c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 11:58:55 +00:00
Francois Ferrand
38ae5aec10 C++: Fix handling of Objective-C/C++
- Objective C/C++ was not enabled in highlighter.
- QMake project part for Objective C/C++ did not have ObjectiveC extension enabled.
- As languageFeatures.objCEnabled is a bitfield, it was actually always set to 0.
- Highlight ObjC class & protocol declarations.
- Highlight ObjC message passing.

Change-Id: I64d12c9509058d05f7adce94598cb7ce91727ac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-12-05 10:27:58 +00:00
Eike Ziller
8f0ddff1cc Merge remote-tracking branch 'origin/4.2'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/shared/qbs

Change-Id: I5050baa31f4a892d00cd6f7e088d1b597921474d
2016-12-05 10:55:35 +01:00
Filippo Cucchetto
1e70a156f9 ProjectExplorer: Fixed missing check for futureinterface nullness
Change-Id: I56808b84964218038ac9709583f07c212391f601
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 09:30:38 +00:00
Tobias Hunger
c9f7aef71d CMake: Stop progressindicator on build settings widget on error
Change-Id: I75051aa23baa88d984092ba594dda72c489d7c19
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 09:27:57 +00:00
Tobias Hunger
4f8769d844 CMake: Tealeafreader: Emit start signal before actually starting
This way we will get the start signal before the done signal if something
fails early.

Change-Id: I015017fdba16dd84f830b2e1fe2742eb0bec02a0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 09:22:50 +00:00
Tobias Hunger
183cdbc91f CMake: Emit errorOccurred on errors in server-mode
Change-Id: I0dd262ccaad3704c70dedff5e0b102032c46d2df
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 09:22:41 +00:00
hjk
c390c716d1 BuildConfiguration: De-virtualize setBuildConfiguration
... and adjust users in Nim and Autotoolsplugins.

Change-Id: I6133ca933a5a4dc4d7d9ff73c8ca7afaa51ae516
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 09:21:37 +00:00
hjk
532c9d49ac QmakeBuildConfiguration: Pass build dir to base setter
Change-Id: I55bd47d62ef644257b49d3423c4d43a6443564aa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-05 09:20:55 +00:00
Tobias Hunger
73e45e30a3 CMake: Clear tasks when forceParse-ing
Server-mode only used to clear the tasks for normal parsing.

Change-Id: Ibbc3ac30f00afaff4874cb0682f5d7e8f1abafcd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-05 09:19:11 +00:00
Christian Stenger
24969964f2 CVS: Re-enable plugin unit tests
They had been lost while the latest refactorings.

Change-Id: I248b274c948a2265aa11d95bbeff143b4a439735
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-12-05 06:11:15 +00:00
Filippo Cucchetto
ad771f9750 Nim: Removed unused FileSystemWatcher
Change-Id: I093b1536a10e5914fbfb14fc2e954c3f07907371
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-12-04 16:21:36 +00:00
Christian Kandeler
f1fc8824c0 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: Ic47bfa33e826cded51369fbd35572f0d7d5cca6f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-12-02 16:26:59 +00:00
Tobias Hunger
e545f8a105 CMake: Work-around first config argument getting skipped by cmake
Work-around the first configure argument getting ignored by cmake 3.7.0
and CMake 3.7.1.

Change-Id: Iaf164cbf973672c1d899738a374c65ea5641132c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 15:33:55 +00:00
Tobias Hunger
cae9f70d75 CMake: Do not forget cmake generator information on load
Task-number: QTCREATORBUG-17311
Change-Id: I3439933e396f74a092c9b46aaced0a73c33c4407
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 15:33:32 +00:00
Christian Stenger
983936f975 Dumper: Fix QObject detection when using procedure linkage tables
Change-Id: I3ac9889b822cb30d2ccdb6a7e2452e753cc3f2df
Reviewed-by: hjk <hjk@qt.io>
2016-12-02 14:44:08 +00:00
hjk
dc2724a3f7 Debugger: Allow QObject property extraction without debug info
Task-number: QTCREATORBUG-16908
Change-Id: I1e1e9d91a6317808610f39868383b67e5c80a9a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-02 13:26:00 +00:00
Christian Stenger
349ad040d6 AutoTest: Limit purging of test tree to project switching
Instead of purging the current test tree on all full parses, just
purge the whole tree if the user switches the current project.
If an item can no more be found after the full parse it gets
removed anyhow.
This avoids losing the check state on any full-parse.

Change-Id: Ia7bae6ced65a69444adf0d7e2a554d90ddd5caa4
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-02 12:29:32 +00:00