Commit Graph

49828 Commits

Author SHA1 Message Date
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
hjk
af54ab960a Debugger: Add a dumper for QSqlField
Task-number: QTCREATORBUG-3905
Change-Id: I9290a9e46d7fa77417d58a3f81d4e4d680c751b6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-08 15:22:10 +00:00
Marco Bubke
b07f3afac6 Initializion with Curly Brackets
Curly brackets for initialization got quite powerful. To not invent a
different style we should use the some style like for rounded brackets.

Change-Id: Id4789fb8d4d7f3980a3a8ce2df999cc57022a2a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-08 14:46:55 +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
Christian Stenger
265890de94 Squish: Adapt tst_WELP01 to latest Welcome page changes
Change-Id: I582c536666657d56850bb344cc6ca471eb75b01e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-08 13:28:01 +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
Leena Miettinen
e8c31158aa Doc: Describe adding Nim Compilers
Change-Id: Ia6ab5c409ae58ae1c7dfd77fd20679dad9266f82
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-08 12:16:24 +00:00
hjk
1f29242276 Debugger: Fix a few bogus CONFIG {+,-}= QT statements
Should be lower case, and += is not really needed.

Change-Id: If51cfcfd8e1971576fe67d3c53c8f18f416e3afe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-08 11:40:46 +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
Leena Miettinen
195c7711cb Doc: Add links from Qt Quick tutorials to UI design overview
...in Qt docs. Because a user felt the information is missing.

Change-Id: I76a7820974073651e6632b0f8e705655377b92c0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 08:26:21 +00:00
Leena Miettinen
6f2c120d1c Doc: Describe changes in the Qt Quick Designer UI
The canvas area now contains Form Editor and Text Editor tabs.
Further, the Properties view can be split to show any view, so
there are now two sidebars.

Change-Id: Ib921a806178606a76d584440e2308d504a297fcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-08 08:26:04 +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
Christian Stenger
183cd8ce99 AutoTest: Use result type string also for summary items
But use a grey'ish color to explicitly mark them as summary
items as they are no real test results.

Change-Id: I7e682a7753e8467e6ec65ac09fb27a7b798d765f
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-08 05:39:45 +00:00
Leena Miettinen
6417865af6 Doc: Write QML in upper case
Change-Id: I42e26b8f6dd38eaefb801fc7c33cb2532fa64df7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-07 15:56:44 +00:00
Leena Miettinen
7f1a71ede4 Doc: Update Qt Quick app tutorial
The wizard and UI have changed.

Change-Id: I43d9101abdcfec362746b069509293df2317ae99
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:55:08 +00:00
Thomas Hartmann
7b66a7427e QmlDesigner: Crash fix
Deleting or cutting the root node is not possible.

Task-number: QTCREATORBUG-17646
Change-Id: I613179c291e744c2d2f6e44ce103bcbd2afaed28
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:47:30 +00:00
Thomas Hartmann
f04f09e17c QmlDesigner: Crash fix
Throwing for an invalid model node does not make much sense.
I expected it returning false and that it what it does now.

Change-Id: I5c8c1a771e95a39bdb9ab7c30b4e94957464ffc1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:47:16 +00:00
hjk
71007df8fd QtSupport: Simplify welcome page examples model handling further
Use the ExampleSetModel directly in the combobox, rely on normal
model reset behavior behavior for gui updates.

Change-Id: Icdb34ff0f572caaf92259530823e90bfd783b933
Task-number: QTCREATORBUG-17678
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 14:29:14 +00:00
Tim Jenssen
f16bd2433b QmlDesigner: remove empty line
Change-Id: If8ad086bed95d051661fe834a6cfb3883bed5269
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 13:05:36 +00:00
David Schulz
a9f446704f Debugger: Adjust python dumper for 32bit MSVC binaries
Change-Id: Ia20321da89b387d016eb7fed076002a709aae748
Reviewed-by: hjk <hjk@qt.io>
2017-02-07 09:18:23 +00:00
David Schulz
26397935b4 Debugger: Fix guard expression
Change-Id: I2f31c3156636a413665aef4c5e327968c26f4a33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 08:59:44 +00:00
Leena Miettinen
8f53c02296 Doc: Describe Qt Quick Designer Form Editor and Text Editor tabs
Users can now use the code editor within the Qt Quick Designer.

Change-Id: I2ad30bafc4b61ce9c1115c9a8b1c019d2b21151e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-07 08:39:20 +00:00
hjk
541dd8643d Debugger: Inline GdbEngine::write into caller
Not used in earnest since the end of CODA/Symbian.

Change-Id: Ib2d22fb247d178b091a17f9927aa911d6707d3f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 06:58:03 +00:00
Orgad Shaneh
f77af5e336 Gerrit: Remove repo selection from the dialog
Behave like the Branches dialog, which is updated by the current open file.

Change-Id: Id106b3e4fa777bcbf08b826f4e7d52845dde57a6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 17:00:26 +00:00
Tobias Hunger
ffbc331168 ProjectExplorer: Use makeEmpty in FolderNode::buildTree
Some lines saved.

Change-Id: I5a5e2bb150070aae48ad0ec1abb08bc2532d093b
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:57:41 +00:00
Tobias Hunger
bd8fe1c42b ProjectExplorer: Deduplicate functionality of makeEmpty
Only one line saved, but potentially less hassle should FolderNode::makeEmpty
ever change.

Change-Id: I4dd01179a8dce9735744991c3de080739ab693ae
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:57:36 +00:00
Thomas Hartmann
0b11ba3177 QmlDesigner: Keep result in local variable
Change-Id: I43c99bb18c1473b67fc40cda02af6cb1595c29ec
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:19:28 +00:00
Nikolai Kosjar
50a07695bd CppTools: Report also C language back to project
...for Project::setProjectLanguage().

Change-Id: I77347c4597061fb48782c629d5ad6898028fee13
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 14:31:49 +00:00