Commit Graph

50929 Commits

Author SHA1 Message Date
Marco Bubke
53dedeef70 Clang: Remove dependency on PchManager
Change-Id: I9084cb3c741b3e56e3b931383b67c0564a331352
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-16 15:31:45 +00:00
Alessandro Portale
a60cf50d57 QmlDesigner: Add some themable and HighDPI icons
Some icons introduce their own .pngs, and some reuse existing ones.

Change-Id: Ib909d4bb718d1e3fafa70ef72baa29ef2657d023
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-16 15:17:51 +00:00
Alessandro Portale
e685e05dfd Utils: Add a "reset" icon overlay
Just as png in the resources, not as Utils::Icon. Other icons will use
the image as overly.

Change-Id: I4c44bb5eb7472a7297692bf95a3030b7843b6de1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-16 15:17:15 +00:00
Robert Loehning
cf091e5c3e Git: Initialize members of StashInfo
Change-Id: I20e644d61163bb91addcfe16a58692cfacb988d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-16 14:59:46 +00:00
Leena Miettinen
95e8f82914 Doc: Fix \include command target
If the whole file is included, the copyright statement is printed
in the HTML file (and we don't want that).

Change-Id: I341c658182745facd000c6ad7ce073c1a37caded
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-16 13:24:16 +00:00
Christian Kandeler
a7ed20faaa QbsProjectManager: Do not interpret Project::GeneratedFiles literally
The files retrieved by calling Project::files() with this flag show up
in the locator, in search results etc. So only consider files that we
know to be human-readable.

Task-number: QTCREATORBUG-17382
Change-Id: I7a66159e67207a09adb57b0c5584b0b067fd1fca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-02-16 12:24:15 +00:00
Christian Stenger
57d1eafeb4 Wizards: Unify used label with other wizards
Change-Id: I46b0a756d825cfff328c747c37a9563c5449a75e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-16 11:33:15 +00:00
Eike Ziller
8ed4685b99 Settings: Do not crash when jumping to filtered out category
Task-number: QTCREATORBUG-17677
Change-Id: I95633a905d71b981e0bb72ce4af2a2fed605f39d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-16 11:08:03 +00:00
Orgad Shaneh
cc97609e60 ProjectTree: Remove "external file" warning when node is found
If a new file is added, it is connected to the updateExternalFileWarning
slot before the project tree is refreshed, and is not disconnected until
closing and re-opening it.

Task-number: QTCREATORBUG-17743
Change-Id: Icc7e3fe547a698d6f63116ca148cf1f4f8b60777
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-16 10:21:23 +00:00
Christian Stenger
374a51b2e0 Squish: Adapt tst_WELP04 to latest Welcome page changes
Change-Id: I835bbcf3676816d92160b2eca967af4adcd3876a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-16 05:42:28 +00:00
hjk
10b56f8930 QbsProjectManager: Replace some uses of Node::projectNodes()
No need to use two filters with a temporary list when the
task can be done in one go.

Change-Id: I96468099eb28c9698dbc637e432a38071d054e39
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 17:32:23 +00:00
Thomas Hartmann
fd9877755f QmlDesigner: Do not select item if parent is invisible
If already the parent is invisible do not select an item.

Change-Id: I0ec667314ae7446cda5ed1f0eaa9234ab419de8c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 16:24:45 +00:00
Thomas Hartmann
7a3a973561 QmlDesigner: Show enabled status of FormEditorButton
Change-Id: I9e35217b13627074b6732dd532ff8fbe99177ebe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 16:23:39 +00:00
Thomas Hartmann
330195ebe6 QmlDesigner: Adding more notifiers to DesignerActionManagerView
Change-Id: Ieeb2387a301ebaaf4b6c7be2bc7aaee9120a34c4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 16:23:02 +00:00
Thomas Hartmann
53d80a3118 QmlDesigner: Moving some stacked container actions
The prev, next and add actions are now also visible
in the form editor toolbar.

Change-Id: I8aff49fd4544b95c9e88c3561c3ea4d59c6dd2e0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 16:22:45 +00:00
Ulf Hermann
3cf6f3d5dd QmlProfiler: Don't try to open editor at line 0
There is no line 0, so if the document is already open, the editor
won't move to the beginning. Use line 1 instead, so that we jump to the
location of the corresponding text mark.

Change-Id: I0c5605d2d48b02d73dd97ddc87a527cf1b5dba8f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-15 16:00:53 +00:00
Nikolai Kosjar
444e496f5d CppTools: Remove unneeded include
Change-Id: I8d49ac57f7e78c975798892681588a0c6db5ef0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-15 14:58:09 +00:00
James McDonnell
a13e666cb7 Add 64-bit QNX mkspecs
Remove obsolete armlev7 mkspec.

Change-Id: I8d7314ef1e2f0f9dd3acef187026ac24d5308c8e
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-15 14:34:03 +00:00
hjk
afcde22408 QmlDesigner: Compile fix after dfe38980
A string literal cannot be used to return a QString.

Change-Id: I32d7515808342552b1b5328c2d0c754a9f94c2a2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-15 12:48:06 +00:00
Ulf Hermann
1cf40ae647 QmlProfiler: Don't register a model ID for the QML model
We never do anything useful with it. This relieves us from the need to
keep the manager around in the QML model and decouples them.

Change-Id: If58fc147b86b07f533aeaaa896f3416d4c0ef6bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-15 12:38:46 +00:00
Ulf Hermann
827d48db6e QmlProfiler: Move the file finder into the QML model
This is the place where we need it most. In addition, this allows us to
use the DetailsRewriter's cache also on gotoSourceLocation.

Change-Id: I14e0f11ba7c8a2a3888b2e8439a375068b36e29a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-15 12:38:30 +00:00
Ulf Hermann
5dd25c42cb QmlProfiler: Move event handling into model manager
This is the logical place to do it. Adding the event first to the QML
model and then passing it back to the manager in order to have it
dispatched to the other models is somewhat backwards.

Change-Id: I64b1cb38f97331b62d83fa5ae49b9b2690810d40
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-15 12:38:21 +00:00
Vikas Pachdha
00d424eadb iOS: Extend SimulatorControl
Add new API's to extend iOS simulator support in Qt Creator

Task-number: QTCREATORBUG-17602
Change-Id: I7e949762a7740f2ffb927f25f327b3e82cd8e180
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-15 12:23:41 +00:00
Nikolai Kosjar
c286639478 Clang: Ignore -Wcovered-switch-default from llvm's cxxflags
...because llvm-config --cxxflags from [1] provides it and GCC 5.4.0
(e.g. Ubuntu 16.04 LTS) does not know it:

    error: unrecognized command line option ‘-Wcovered-switch-default’

[1] http://releases.llvm.org/3.9.1/clang+llvm-3.9.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz

Change-Id: I0a38fa1bdcd38991b66137773a3cdc9b095095a8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:16:18 +00:00
hjk
532204129b ResourceHandler: Replace traditional visitor by lambda
Less code, closer to the place where it is used, and
avoiding the need to have the temporary fileNode lists.

Change-Id: I47b831aef7583b73a69276da4a301d812de75c69
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:13:46 +00:00
hjk
1d686f9aa4 ClassView: Use visitor-by-lambda
Less code, and avoiding the need to have the temporary
file and folder node lists.

Change-Id: I65e1a7ec022b61f94b01e1e8476bb932d22fd161
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:13:35 +00:00
Thomas Hartmann
4761c3465d QmlDesigner: Remove Formeditor prefix
The actions are not really related to the form editor anymore.
Some categories are empty.
We moved the toolbar out of the form editor.

Change-Id: I3616122513b1aceef2101c177ab9e8e9c8908fcb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:01:33 +00:00
Christian Stenger
d6e1746a06 QmlDesigner: Fix compile using Qt5.6 on macOS
Change-Id: Id3c8ad2d9ceefd63fd6a4b7d8804f8c5551aa6a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:01:05 +00:00
Thomas Hartmann
b8ea84adcf QmlDesigner: Polish actions in QmlDesignerPlugin::integrateIntoQtCreator()
Before it was done in DesignModeWidget and the design mode had to be
opened once to show the actions in the Qt Creator options.

Change-Id: I62de2dcab66149b8470261002b019894fb345c8b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:56:11 +00:00
Thomas Hartmann
7c259aa71c QmlDesigner: Fix crash
The item m_labelItem might be null.

Change-Id: I3c4c8c1141694a72ad7eb71498929538da55b920
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:55:54 +00:00
Thomas Hartmann
423d360c23 QmlDesigner: Use colors from theme the for selection indicator
Change-Id: I3430e7c49678422811754f1c0400291cdf61c29b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:55:47 +00:00
Thomas Hartmann
d5848560d4 QmlDesigner: Move source tool to FormEditorToolBar
Change-Id: I9a39ce1d1860941d91ec6c662d23fd86c5ddecf9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:55:04 +00:00
Thomas Hartmann
fb7cd0cca6 QmlDesigner: Implementing FormEditorToolButton
This allows to show certain actions inside the selection label.
This is useful for context dependent actions that do not belong
in the general toolbar and gives those actiosn visibility.

Change-Id: I24499d760556c5a60e108f847d39e645b8ee692f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:54:54 +00:00
Thomas Hartmann
dfe3898041 QmlDesigner: Implement preliminary support for qsTranslate
There are now 3 options for QML translations in the options.

* qsTr (default)
* qsTrId
* qsTranslate

In case of qsTranslate the context is preserved when editing the text
and the context can be changed by setting a binding on the text property.

Task-number: QTCREATORBUG-17714
Change-Id: Ied2ccb84d98d99d5b920fe47ee6d8cb67ff2bd5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:54:47 +00:00
Alessandro Portale
6052e28b84 VariableChooser: Use FancyLineEdit instead of QLineEdit
Utils::FancyLineEdit is usually used for filter fields, since it already
has the "Filter" place holder and a nice clear button.

Change-Id: Ifc6244129f5b47ba29dd0d421f3c69f5e21e8aac
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Serhii Moroz <frost.asm@gmail.com>
2017-02-15 11:46:48 +00:00
Alessandro Portale
4bd30b1d1f QmlDesigner: simplify ZoomAction::setZoomLevel
There is no need to reimplement qBound.

Change-Id: I3b753f30bd183392bef88810228c2153a5edbdb5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:41:22 +00:00
Eike Ziller
47edfb3201 Remove unused and broken app manager plugin
Change-Id: I9614fe59ebd10c65b2c8b06e81dd15c2876bae89
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-15 11:20:27 +00:00
Tobias Hunger
3bd6b69e66 qmake: use nullptr
Change-Id: I372c0b49b894c3758621e2e9d2b73aaa49371dde
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:03:18 +00:00
Tobias Hunger
4070b49118 qmake: Enable more code
Change-Id: I3b2a7d638571cb941906f37c7dfd6de613261a0a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:48 +00:00
Tobias Hunger
07c0ca5ef5 qmake: use class instead of struct
Change-Id: Ieb0d7557555c4a0c2e196b28841972483f3fd135
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:41 +00:00
Tobias Hunger
cf7c9dd063 qmake: Remove unnecessary includes
Change-Id: I9581b612acfba6f2da32cf7da9c793f09b56f0e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:29 +00:00
Tobias Hunger
f4659ecc82 qmake: Introduce tree structure into QmakePriFiles
Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:18 +00:00
Tobias Hunger
69684d9f9c qmake: Rename QmakeParser*FileNode to Qmake*File
Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:04 +00:00
Filippo Cucchetto
d2f78fb431 Nim: Project wizard should filter Kits without a Nim toolchain set
Change-Id: I3ccdc5e7062aa9c26edadcd989dcd855b45b38eb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-15 10:46:20 +00:00
Robert Loehning
f2a225db72 Debugger: Remove pleonasm
Change-Id: I95a4089fe042b8e5c9bdede870489613e86f52fc
Reviewed-by: hjk <hjk@qt.io>
2017-02-15 10:35:14 +00:00
Serhii Moroz
3c91c83f41 VariableChooser: add filter
Change-Id: I604b39f96ff303502949d581d094067025093ca0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-15 10:26:24 +00:00
Mathias Hasselmann
d6a84fe22c Use full Qt name for generated Android kits
Instead of "Android for armabi-v7a (GCC 4.9, Qt 5.7.1)" this gives
"Android for armabi-v7a (GCC 4.9, Qt 5.7.1 (android_armv7-project)"
which isn't exactly nice for the double parenthesis, but necessary
to maintain basic sanity with project specific Qt builds.

Change-Id: I2d41334a7f1ff28dc056d5967abe2b4b8697b63d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-02-15 10:12:39 +00:00
Tobias Hunger
458ec1a284 qmake: rename QmakePriFile to QmakePriFileNodeDocument
... to avoid ambigularities later

Change-Id: I81a062750b03f1b49a306b1694bc137b70b04606
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:11:58 +00:00
Tobias Hunger
574669d333 qmake: Move more code into anonymous namespace
Change-Id: I9178c29637ae76e57ba885de671d11418284c3e2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:10:17 +00:00
Tobias Hunger
48b7966d75 qmake: Remove InternalParserNode again
The parser nodes do not need to represent the actual project
tree, so there is no need to keep the tree-structure. Store
the list of files instead.

Change-Id: I83e036d4b9b42e4186b4ef23ac573865942ee97e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:10:07 +00:00