Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
1f1ee1ec2b CMake: Make configitem optionally use a macroexpander instead of a kit
Change-Id: I218979aff626630abd3b7113596ac5c731309432
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 14:34:57 +00:00
Nikolai Kosjar
caf721430b CppTools: Avoid "defineLine" in CompilerOptionsBuilder API
...because it might suggest to append a new line.

Change-Id: I8d5701a1d20c9d94ee528383227a6e3b446b4ff2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-17 14:29:49 +00:00
Eike Ziller
a2871e5513 Merge remote-tracking branch 'origin/4.2'
Change-Id: I3a54f679238e6eb4f053608286fc39eae3041561
2016-10-17 16:22:08 +02:00
Eike Ziller
02a39c013f Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp
	src/shared/qbs
	src/tools/3rdparty/iossim/iossim.qbs
	src/tools/3rdparty/iossim_1_8_2/main.mm

Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054
2016-10-17 16:16:07 +02:00
Tobias Hunger
4798d038a4 CMake: Clear files when cleaning CMakeBuildTargets
Change-Id: I16fefae569f807776e422b4b662d5b42d1230df2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 13:48:52 +00:00
Vikas Pachdha
28341ac3f1 iOS: Removed ios_sim tool source. simctl is used for app deployment on iOS Simulator
Task-number: QTCREATORBUG-16942
Change-Id: Ie50bdfdbf9005e383a2753a3c6081a563a175f61
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-17 13:47:21 +00:00
Vikas Pachdha
2b0daf42ce iOS: Replaces ios_sim tool with simctl
Task-number: QTCREATORBUG-16947
Change-Id: Ia28d5e4f9f220d566bd64da73989e8c24ef3eb37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-17 13:46:34 +00:00
Nikolai Kosjar
f4994a5f76 CppTools: Always pass in header paths as native paths
Change-Id: I473c737107c14a4bc2c78b7c697eef02eb4bacff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-17 13:19:55 +00:00
Nikolai Kosjar
f31735142c CppTools: Exclude compiler option from conversion to native path
...otherwise e.g. MSVC's "/I" option will be converted to "\I".

Change-Id: Ia01519ee5c942d0f3cdd32c4302055d0e58fb865
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-17 13:19:50 +00:00
Nikolai Kosjar
3394cc7bfe ClangStaticAnalyzer: Remove new line character from define value
Change-Id: I3949ba372c490d39b4277825f5194a8d36ee26d2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-17 13:19:46 +00:00
Tobias Hunger
93051ad76c CMake: Update button labels on dialog asking to import CMake changes
Change-Id: I5a4b0f192b30b7104ee7da160bcbf269f3f59bb3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-17 12:40:03 +00:00
Tobias Hunger
9ff2bd16d3 CMake: Use Utils::FileName where appropriate
Change-Id: I3ab0a68920e27ebcf4e1dd58180a72ded58b892e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-17 11:41:51 +00:00
Tobias Hunger
567db27e57 CMake: Cleanup CMakeCbpParser
Change-Id: I7fa193297e02ae8e3c5de88583f39409aeecf01f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-17 11:30:47 +00:00
Tobias Hunger
b1433e2a05 CMake: Only pass the path mapper to the cbp-parser
No need to pass in the complete kit. Remove a couple of unnecessary
namespace names.

Change-Id: I2ac895535a80b4a54a423ce62dbdede65b67437b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 11:02:26 +00:00
hjk
91090f8871 ProjectExplorer: Add an "Active Project" label to Project window
Change-Id: I9036d25f9cde0849c8a2fed5b2c3ce97f1315f55
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-17 10:40:07 +00:00
Tobias Hunger
fe23c71414 CMake: Slim down BuildDirManager's interface
* Make parse() private

Change-Id: I587f72296e4520ed62db06b7d46987907975eb2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 10:09:47 +00:00
Tobias Hunger
d9d752cf13 CMake: Clean up cmake project
Change-Id: Icfa2e1af8ff53c06954cb0b3b5b4b2ad974d6585
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 10:03:13 +00:00
Orgad Shaneh
fc64192312 QmlDesigner: Fix compilation with Qt 5.6
Broke by 5da074f95a.

Change-Id: Icd0400e7b19a564ba2777e1cceadd4994eb867f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-17 07:50:22 +00:00
Christian Kandeler
a1155883bd Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: I36b6804100a41e52a8f1ec20e987ffeed6721245
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-14 19:57:40 +00:00
Thomas Hartmann
5da074f95a QmlDesigner: Fix ESC issues
We do not want to switch to the editor whenever pressing ESCAPE.
Using shortcut override does not work for QQuickWidget.

Therefore we register our own action and disable it.

Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-14 15:20:00 +00:00
hjk
d78e87329f ProjectExplorer: Filter out unusable kits
As side-effect, fix missing expansion of subitems in some cases.

Task-number: QTCREATORBUG-17110
Change-Id: Ib0c74e968d6d814f9dadbb37b323c8ac68cda310
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-14 12:09:44 +00:00
Nikolai Kosjar
35f6a0b954 Clang: Fix uninitialized member
Change-Id: I31cbce287f1f8d2b0c55be23fde4288ec3472639
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-14 10:30:54 +00:00
Christian Stenger
389ef1cc99 AutoTest: Polish framework settingspages
Change-Id: If39e157c499b7ee9454d61de39ce2b360a109a94
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-14 09:55:03 +00:00
Nikolai Kosjar
dd647b4236 CppEditor: Clean up header error indicator
* Show/hide the error indicator button instead of enabling/disabling it.
* Use "Minimize" instead of "Do Not Show Again" in the info bar button
  and use a custom setting to save this. The current info bar API does
  not signal addition/removal of global suppression ids which would be
  needed to update all editor widgets properly. We are the only client
  and it feels wrong to add this API there at the moment.
* Remove not needed code anymore.

Change-Id: I2bb872522b7410434f060cc359a3b62dfed0af4d
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-14 09:01:17 +00:00
David Schulz
3016c6c96f Cdb: Optimize dump of std container
Cache container member offsets.

Task-number: QTCREATORBUG-16710
Change-Id: I47c471eae355e1f1220fe22ad1cdd0cb67d430a1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-14 08:26:03 +00:00
Orgad Shaneh
a1876a8509 QmlDesigner: Use a static const QSet for keyword list
Makes the lookup faster.

Also sort the keywords.

Change-Id: I25ce0f2d1de7be572fecccc09b5ec12d81152e95
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 18:57:24 +00:00
Thomas Hartmann
d75d94c8c0 QmlDesigner: Do not allow JavaScript keywords as ids
Change-Id: Ifbbc7c36778dcc4e63df8c34929cd7f872875087
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 16:48:10 +00:00
Thomas Hartmann
5b5aaf9eb3 QmlDesigner: Add more items to component combobox
It makes sense to also add items that are not in a default properties
to the component comobox.

These are items like styling delegates:

Slider {
    handle: Item {
    }
}

or the items of e.g. a Flipable:

Flipable {
    front: Item {
}

Those items are not shown in the navigator (TODO) and it makes
sense to edit them if they were an inline component.

Change-Id: Iab5b6e0238625b5a486901fbf617911d06a34581
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 15:58:22 +00:00
Thomas Hartmann
e05cb92cea QmlDesigner: Changing order of imports in UI
File imports should be first, because they relate to the
project and there are most likely just a view.

Change-Id: If7bfc648c694bcc3f010d99b125d7349061bb6db
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 15:57:06 +00:00
Thomas Hartmann
088972dd29 QmlDesigner: Allow adding of file imports
All the functionality to support file imports
in the import manager is already there.
We just have to add the file imports as possible imports.
We only include direct sub directories that contain at least one qml file,
but no qmldir file.

Task-number: QTCREATORBUG-12126
Task-number: QTCREATORBUG-11518
Change-Id: I1b606ae11682886f430794f451177980b9c5f9aa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 15:49:59 +00:00
Alessandro Portale
f38a719615 Utils: HighDPI-able, themable filenew and open icons
Change-Id: I1b9dc3393c6ec7965fbca42a561303ddc01201eb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-13 15:33:53 +00:00
David Schulz
b0ea129299 Debugger: Fix bitsize for pointer
Change-Id: Icb3fe3dafbff75cba72758459d760470e01afb9b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-13 13:19:37 +00:00
Thomas Hartmann
b0d5887638 QmlDesigner: Adding support for font weight
We have to tell the rewriter that an enum scope called "Font"
does exist.

Change-Id: Ib77a099d94ec84b99e54e3c9151249df53eb53fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:13:51 +00:00
Thomas Hartmann
da202bff82 QmlDesigner: Adding support for padding
This property has been added to Qt Quick 2.6.
We do not show the padding section for Qt Quick versions
that do not support padding.

Change-Id: I10123c65849e1708d452320ba3e3b4cb19f5b5bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:05:26 +00:00
Nikolai Kosjar
6884ab080e ClangStaticAnalyzer: Fix path for intrinsics for clang toolchains
Ignore the include path for intrinsics coming from the toolchain. The
clang static analyzer comes with its own intrinsics and does not cope
well with intrinsics from other clang versions.

Move the relevant implementation from LibClangOptionsBuilder into the
base class so that ClangStaticAnalyzer profits from this, too.

Task-number: QTCREATORBUG-17102
Change-Id: Id9a28ddebb889c862939332dce888a80b3bb7e63
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-13 10:17:58 +00:00
Thomas Hartmann
c4417c49c7 QmlDesigner: Write single non ASCII chars as escaped unicode
We do not know if the string was escaped or not in the model.
But this heuristic at least improves the issue
and single characters are escaped.

Task-number: QTCREATORBUG-12616
Change-Id: I3dcc251ce111ab3ee377a17876e2cdb64162d6e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 09:58:45 +00:00
Tim Jenssen
4dffc26cd1 QmlDesigner: use Utils::FileName
No behavior change.

Change-Id: I7e8bc51bf1fed99159945c656402bb315aebc3f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-13 09:51:32 +00:00
Nikolai Kosjar
55eb030f4f ClangStaticAnalyzer: Use native paths consistently
...when passing on arguments to the clang executable.

Change-Id: I78d523289abadee85d8987e54fb962220b1e62a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-13 08:40:20 +00:00
Nikolai Kosjar
9c88b03415 ClangStaticAnalyzer: Tests: Clarify meaning of assert
'arguments.first().toBool()' returned FALSE

...is not very expressive.

Change-Id: Ia0c8e8fbe2e84ea4f41668a5179a63e2003bab03
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-13 08:39:42 +00:00
David Schulz
a07e9450e8 Debugger: Fix type lookup for pointers
Change-Id: Ie89a120cafd6755f1e2f61f15eb39fd64f0494d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-13 07:51:07 +00:00
Orgad Shaneh
eed064c7ed Core: Save session state on autoSave
If Creator crashes, session information (like open files, bookmarks
etc.) should be restored.

Task-number: QTCREATORBUG-16752
Change-Id: Ife1a2ffb62a3dd9b302e08ad9df9537667173e47
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-13 07:22:48 +00:00
Alessandro Portale
3517480557 ClangRefactoringPlugin: Avoid building the plugin for the 4.2 release
Building it (and its companion tool) on Windows is such an obstacle that
most developers and also the nightly build has not yet been able to do
that.

Change-Id: Ic0f10fbbbc4e2fe041ff64b30cd8afdff241d7a2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-10-12 20:20:30 +00:00
Christian Kandeler
f2f951187b Bookmarks: Fix qbs build
Change-Id: I9a867183f1e03468e009950d9289c84c261a012a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-12 20:18:02 +00:00
Orgad Shaneh
738eaf85d1 SessionManager: Improve encapsulation on save
Change-Id: I3fa5edf226c8369f9f12ccf95bf2914b50f9d48b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-12 16:30:56 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
2016-10-12 16:02:47 +02:00
Alessandro Portale
a77c5836e9 Utils: HighDPI and themable copy/cut/paste icons
Change-Id: I7ff7ca17f719d1a94b9b4e841db4d8f01f2781d7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-12 14:01:12 +00:00
Tim Jenssen
1dccd25794 QmlDesigner: qDeleteAll does the same
Change-Id: I5ccb9279cfcc38455347badf61ab6ddd2ad047ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-12 12:26:35 +00:00
Tim Jenssen
50f5b6b5e3 QmlDesigner: no need to copy the list
Change-Id: Ie6d5c1e7a0baaec9f6065854e451bb5d767619e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-12 12:26:23 +00:00
David Schulz
edd239a3de Cdb: Strip const before template parameter lookup
Change-Id: I21226e867944c3277fcb3fec40a04436d055d9e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 10:13:37 +00:00
Tobias Hunger
d3d5bc5900 CMake: Do not reset generator information
Do not reset generator information when the generator kit information
is already up to date.

Change-Id: I6bd9b94e8b83af2a58cc11ffcbfa11982374644a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-12 09:58:44 +00:00