Commit Graph

44349 Commits

Author SHA1 Message Date
James McDonnell
f163cdc9fe Switch QNX tool chains from hard-coded to detected ABIs
Move the target detection code from the QnxConfiguration class into a
separate function that can be used by the QnxConfiguration code and
the QnxToolChain code.

Move some resetToolChain calls after setSdpPath calls.  QNX ABI
detection depends on the SDP path.

Change-Id: I7417a5a1064a77edfb113d9d0010f1e061b81ca6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 13:46:14 +00:00
hjk
46e4ecbd44 Make Creator compile without Qt tools in some configuration
Needing to compile Qt tools is a bit of a chore (and at some point a
diskspace issue) when building/starting Creator as sanity check for
comparing different compiler optimization settings.

This is not an officially supported configuration.

Change-Id: I628e33eb7137f09ecfebbd27453de548bac2fde5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-10 13:30:53 +00:00
Tim Jenssen
d864bfc529 ResourceEditor: use const reference for QMap argument
Change-Id: I04d2c7de47bc91fd8f6fa355a03fc0d19681f451
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 12:05:57 +00:00
hjk
54248a92e7 QmakeProjectManager: Add .pro files to tree unconditionally
This fixes a regression introduced by 04a525877b.

Change-Id: I19467bf802b020fedd48df85051aa3944fd9a329
Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 11:24:46 +00:00
Tobias Hunger
4f40d7778d CMake: Introduce project importer for cmake projects
Change-Id: Ie215e1c3f0286f6d98d10865e2b0a16b01391cd5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:34:07 +00:00
Tobias Hunger
c09b3709b9 CMake: Reimplement CMakeCache.txt parsing in BuildDirManager
The CMakeProjectImporter will need that in addition to the tealeafreader.

Change-Id: I453a7a124b5303e163e9c85bc3fc215215617119
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:33:56 +00:00
Tobias Hunger
87504eac2d ProjectExplorer: Handle toolchains at the ProjectImporter level
Change-Id: I941d2eaa6fdd6135b49b51e8f685fb1d0d8b652c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:33:45 +00:00
Tim Jenssen
587b2cbe0f ProjectExplorer: fix crash while canceling a process
m_process was nullptr at this moment

Change-Id: If990eb7034c3bacc1ace7fd607d0247aec8aeb68
Task-number: QTCREATORBUG-17698
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-10 10:02:06 +00:00
Thomas Hartmann
eaedebb7f1 Fix linkage on msvc2015
This does not link without this explicit compare
function after the QLatin1Strings have been removed.

Change-Id: I09cd323f850954eedefed6ee58597cb0ef3ab026
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 15:18:48 +00:00
Thomas Hartmann
b8f4445ea1 QmlDesigner: Adding logging to form editor
These logs are useful to debug hints and form editor
behavivour. Adding more if required.
I cleaned up the include order.

Change-Id: I39b8c4e215ba4e6a524f4b00828156d6e56d8eb7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:35 +00:00
Thomas Hartmann
c18186275a QmlDesigner: Adding QmlItemNode::isInStackedContainer
Change-Id: I8a24185e71cf92635bc10876f8cf59240e1b309b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:19 +00:00
Thomas Hartmann
3b0a99362d QmlDesigner: Adding hints for StackLayout
Change-Id: I3885662bf50a10321cc756a9acd8dada4bfa7b73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:09 +00:00
Thomas Hartmann
74a63be6d0 QmlDesigner: Do not return invisible items as containers
If an item is invisible then it is not an intuitive container.

Change-Id: I1f978be98b7330848e19192843188331438b98ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:01 +00:00
Thomas Hartmann
94c3473fe7 QmlDesigner: Adding missing const
Change-Id: I3c1b05da5c6a66f8f5b87dc2525f66ce85442d3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:04:51 +00:00
Christian Stenger
fe16f0b38e Valgrind: Modernize code
* QLatin1String
* initializer list

Change-Id: I6654fcd8b8ec513d1802a4ba3fe3f5833a29136b
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 13:55:00 +00:00
Christian Stenger
e952b9d4f3 Replace occurrences of QStringList() << pattern
Change-Id: I598d8c06193c2e72435a76165d1afc9ee3465b48
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 13:17:49 +00:00
hjk
04a525877b ProjectExplorer: Merge FolderNode's m_{file,folder}Node fields
One step closer to direct use of Utils::TreeNode.

Change-Id: Icd0dfd2fa4d12c2572a68f61ae43c5e906956a0e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-09 12:15:23 +00:00
Thomas Hartmann
719ff7047b QmlDesigner: Allow property name "type"
There is no reason to not allow "type".
This was a leftover we store the type/className in
"className".

Change-Id: I6a760e9df522fcda42fc2d18c06aaaac15523cd6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:45:52 +00:00
Andre Hartmann
95e6dfe8e0 Git: BranchDialog: Disable buttons when selection disappears
Steps to reproduce the old and wrong behavior:
1. Open branch dialog
2. Select a branch
3. Select checkout
4. Branch is checked out, but no longer selected
5. Buttons like "Log" stay enabled, but don't serve
   any purpose

Change-Id: I3974b7cb87553d1ff57fd5578b908f02c949a509
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-09 11:26:39 +00:00
Vikas Pachdha
c97a54cebf Android: Fix crash on using Re-run app
Collaterally busybox detection(dead code) is removed

Task-number: QTCREATORBUG-17691
Change-Id: I50de3e4ad299c741c9b1afaddb22209b409acccf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-09 11:22:48 +00:00
Tobias Hunger
35118db5be TerminalAspect: Initialize bools
This fixes the problem where sometimes you need to visit the project
page to make run in terminal work.

Task-number: QTCREATORBUG-17608
Change-Id: I681378cdaa19becf532666401e8695c246e1f5bd
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 10:10:10 +00:00
Tobias Hunger
0e25c08942 CMake server-mode: Use more robust logic
Use a more robust logic to find existing CMakeListsNodes again.

Change-Id: Id26031c1164eb6271b74ccf39071219938b285fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:08:13 +00:00
Tobias Hunger
c20ae42e20 CMake: Show all headers below an included directory in server-mode
Change-Id: I2ff0018a3c92ccb55eca957624cc44f941ec866c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:08:07 +00:00
Tobias Hunger
bc598ec480 CMake: Fix project name selection
Change-Id: I03740045d817762ef91cf6399ac449c5af67b278
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:07:57 +00:00
Tobias Hunger
a9947c24a9 ProjectImporter: Add helper method
Add a simple helper method to extract the project directory.

Change-Id: Iafb9e8f5611a6fc5941c9bb3005a265e785138a2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:55:08 +00:00
Tobias Hunger
4bbac74a9d CMakeBuildConfiguration: Add helpers to deal with CMakeBuildTypes
Add helpers to deal with CMakeBuildTypes and to map them to
BuildConfiguration::BuildTypes.

Change-Id: I03ce9e83b5d044c3d94d29c44cc0a28560b206f6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:54:57 +00:00
Tobias Hunger
fe695bd2ba ToolChains: Implement detection of toolchains based on compiler path
Do not bother to implement this functionality for toolchains that are
assumed to be completely auto-detected (e.g. MSVC) or require
infrastructure around the toolchains to be useful (e.g. embedded platforms).

Change-Id: I3e7dfe2f3c30a0d2d2bb16364895151f95b16423
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:53:45 +00:00
Tobias Hunger
578af1e701 ProjectExplorer: Enable factories to autodetect a specific toolchain
This is necessary to auto-detect the toolchain e.g. found in an existing
cmake or qbs build directory.

Change-Id: I1405d1337855d55fa0145e8b50a5864ff0d4231b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:53:39 +00:00
Tobias Hunger
fa6ba28cc2 GccToolChainFactory: Split up autodetection of toolchains
Split up autodetection of toolchains into one part that scans for
possible candidates to autodetect and another part that examines
each individual candidate.

Change-Id: I15167c72d5e9b51a126f83bdd2a7dd95efe0a6ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:53:34 +00:00
Tobias Hunger
4b8b28c59e QtSupport: Polish: Remove unnecessary include
Change-Id: I20c73d731626e5f8b0cb885ae3a3b0d6c68e1b62
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:53:23 +00:00
Thomas Hartmann
1f119a0e26 ProjectExplorer: Ensure the FLatModel is build initially
If the FlatModel is created after a project is opened,
no update was triggered.
Therefore a lazily created ProjectTreeWidget was empty.

Task-number:  QTCREATORBUG-17690
Change-Id: I3c7d1fe63471127ff2d4b344d2341ccf6c3c93ff
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 08:57:47 +00:00
Christian Stenger
f00a113eb4 AutoTest: Fix crash on close
Introduced with latest changes to TreeItem.
It is a bad idea to remove child items while iterating over them.

Change-Id: I6941f4728cf93e47b3ef6405bd1304112946c481
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 08:36:16 +00:00
Andre Hartmann
fd8ee7f044 Git: BranchDialog: constify local variable
Change-Id: I3c7d1fe63471127cd2d4b344d2341ccf6c3c93c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-09 05:24:41 +00:00
hjk
196dbbe0e7 Utils: Introduce TreeItem::{begin,end}
... and use this to reduce the number of explicit uses of m_children.

Despite of being shorter code by itself it is a step towards having
an explicit LeafItem object that doesn't explicitly store a(n empty)
vector of child nodes.

Change-Id: If8db85e2f1134dd1578a78d31235bf57a28f863a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-08 16:08:42 +00:00
Filippo Cucchetto
03d52a2a3c Nim: Added Nim compiler output parser
Change-Id: I45ea20e4767dedfe0f99002f9d8ad2ffb0f268db
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-08 14:30:43 +00:00
Christian Stenger
2475da1bb5 Replace some more occurrences of QStringList() << pattern
Change-Id: Ic7193ac3a741763479a9ef129ed05cb7ca64f1e9
Reviewed-by: hjk <hjk@qt.io>
2017-02-08 14:27:48 +00:00
Marco Bubke
38b6f4ff85 Utils: Reserve a container before you use transform
It is seen as good practice to use Container::reserve if you know the size
in advance.

Change-Id: If1398eaa099f4d3f657778aca46516f9bdec14c9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-08 14:24:45 +00:00
Thomas Hartmann
556df81620 QmlDesigner: Forward events to scene
This allows items in the scene to handle mouse clicks and hover events.
This is required to add e.g. a toolbar.

Change-Id: I3780735f1cbe30df0481d421f2aa2646f8e270d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 13:34:23 +00:00
Thomas Hartmann
4c5d0a6611 QmlDesigner: Never use ALT+CRTL for shortcuts
The users of certain keyboard layouts do not
like it, if e.g. their shortcut for "}" is taken by a shortcut.

Change-Id: I93db8627d23624ed3a87dd6a8bfafc037caee0a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 13:34:15 +00:00
Thomas Hartmann
ab206418c7 QmlDesigner: Improve selection indicator
The indicator for a single selection now has a label.
I also adjusted the color a bit.
The selection indicator now has a width of 2.

Change-Id: I541e8d3ab3f648af8b1fc6b0c005ddd538bb7de8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 13:34:05 +00:00
Thomas Hartmann
05e07316cc QmlDesigner: Ensure shortcuts work as expected in integrated text editor
We have to override a couple of more keys and some key sequences.
Crtl + Alt is used for keys in certain language layouts.

Change-Id: I471b8c4042989cb2821a8f27a87336f20d0e37e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 13:33:39 +00:00
Thomas Hartmann
f096d16e87 QmlDesigner: Fixing crash if FormEditorItems have custom children
If any FormEditor item has non FormEditor item children the current
code will crash. While currently FormEditor items do not have such children,
we might add such children in the future.

Change-Id: I894324a4b247e91eb3fd0db30eb4d9f198f7474a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 13:16:49 +00:00
Thomas Hartmann
631d960cfe QmlDesigner: The items of the form editor should not accept buttons
The mouse buttons are handled by the tools.

Change-Id: Ie47818e7acfe32db69d9258175580c7cdb05ed5e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 12:55:00 +00:00
hjk
d5d3c88f75 WelcomePages: Some minor cleanups
Includes, ...

Change-Id: I97ee4c4af45e00020ea37467ad46216d34be0062
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 12:50:30 +00:00
Friedemann Kleint
ce088cb754 Call QPainter::end() prior to QPixmapCache::insert()
Inserting a QPixmap with active painters on it causes it to
do a deep copy of it, which is unnecessary.

Task-number: QTBUG-58653
Change-Id: I49123ffcec2e12a01c87974b7a513d68a11185d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-08 11:33:01 +00:00
hjk
56409f5afa Replace a few occurrences of QStringList() << ...
... by something shorter.

Change-Id: I363b4e509adb07997517b2d233246a333aea4aea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-08 11:21:45 +00:00
hjk
95e2d7f545 ProjectExplorer: Remove ProjectNode::m_projectNodes
They are duplicated in m_folderNodes, use them.

Change-Id: I4571720f1ef3daf098870a3cf05fa28a1002bb3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 11:15:55 +00:00
Tim Jenssen
c985914bde QmlDesigner: fix ResizeHandle pen
Change-Id: I6b5733714a6d0cbf6d20dd74be88cdbdf7d7bd54
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-08 11:13:57 +00:00
Konstantin Podsvirov
2257b03212 ClangCodeModel: fix link error with MinGW based build
For MinGW clang link library named: liblibclang.dll.a.

Changes:
- improved clang library search algorithm;
- use clang_defines.pri in clangpchmanager.pro.

Task-number: QTCREATORBUG-17680
Change-Id: Ic01fa86238b980991726eeb984ccd82afb333c35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 10:42:35 +00:00
Christian Stenger
8415a7984c AutoTest: Unify background color of results pane
Change-Id: I0868fe35414a4215cff2f5f6b541aada91c03a39
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-08 05:39:59 +00:00