Commit Graph

44349 Commits

Author SHA1 Message Date
James McDonnell
e8b02713b1 Propagate cpuDir into QnxToolChain
Add sdpPath and cpuDir comparison to QNX tool chain comparison.
Ensures that QnxConfiguration created tool chains don't get
removed just because they have the same ABI as another QNX
configuration created tool chain.

This should really be visible in the interface but that can be
done later since this isn't something that can currently happen
with official 6.6.0/7.0.0 SDPs.

Change-Id: Ibbb6a8aa645721028d1512460e51e59633b3cedc
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
2017-03-31 19:46:40 +00:00
Joerg Bornemann
848b8c0f44 Update qbs submodule
To HEAD of 1.8 branch, and adapt to changed API.

Change-Id: Ie180b114726134a06dfefe9dc3a6dc27997f246c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-31 14:44:49 +00:00
Christian Stenger
8bfc47c889 CPaster: Fix accessing pastebin.com
URL now uses http with ssl.

Change-Id: Iaa2bedf6710e30a280fa72b430ec3b67bce08d65
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-03-31 10:01:15 +00:00
Thomas Hartmann
9089fbdfc5 QmlDesigner: Allow Dialog in .ui.qml files
The support is not perfect, but I see no reason to
excplitly not allow it.

Change-Id: I6b1d825acde156cc7b50160060e89bb964667ab8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-31 08:56:18 +00:00
Ulf Hermann
6e5d7e54db QmlProfiler: Use a ranged for loop in QmlProfilerModelManager::dispatch
Change-Id: I852bb4935b529953e677791d32d17c886f22bffd
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2017-03-31 08:32:30 +00:00
Ulf Hermann
4682409252 Timeline: Don't select by typeId if the typeId is already selected
Otherwise we get strange selection loops.

Change-Id: Ifdd6cf2c906fb7077a1aa0013f4a0c640de36688
Task-number: QTCREATORBUG-17937
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-31 08:31:34 +00:00
Ulf Hermann
2080096ec3 FlameGraph: Attribute extra space in root item to "others"
The QML profiler's memory and allocations mode includes allocations from
non-QML code. The space allocated for those in the flame graph shouldn't
just be empty.

Change-Id: I390bf880097d51a19d5027b06bda25dbfaecc09e
Task-number: QTCREATORBUG-17939
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-31 08:31:04 +00:00
Thomas Hartmann
36a913b470 QmlDesigner: Set fusion style on ImportComboBox
For some themes this is done anyway, but not for the default themes.
We have to do this to ensure the "base style" plays well with the applied
.css.
Otherwise the combo box might sound out in weird ways and the colors
might have usablity issues.

Task-number: QTCREATORBUG-17933
Change-Id: I4319ed9b965f4b4b3e975f2348fb89ffd9987bc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-31 07:59:18 +00:00
Thomas Hartmann
7ff7aefeb3 QmlJS: Add special severity for loading type information
The designer has to be able to handle this error/warning
explicitly. To be able to identify the warning I added
a special severity.

Change-Id: I99571497f7327a7857244ef48334c14a254c8ca0
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-30 13:07:28 +00:00
hjk
54d49432f5 ProjectExplorer: Split RunControl states further
This adds enough hooks to enable the base RunControl to take over
the task of most of the current ad-hoc "state machine" implementations
in derived RunControls (only exception is "intra-debugger" Start/Stop
handling), including error reporting.

The idea is to migrate "downstream" uses and finally remove the custom
state handling everywhere.

With this setup here, both varieties of RunControls can co-exist
for a while: New-style uses the Tool/Target state handling triggered
by the base RunControl::start implementation, old-style had this
function = 0, so all have their custom start() implementation.

'SimpleRunControl' derived cases (Local/RemoteLinux/Python run)
already use new-style with this patch SimpleRunControl doesn't
re-implement start().

Change-Id: I508f5ed05c557ca7188af92f9d9c8d00e2a4acfe
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-30 12:11:05 +00:00
Eike Ziller
bac2e6c17a Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/cmakeprojectmanager/servermodereader.cpp

Change-Id: I58e7b33d32c41cb48a24a5638ddb256212dd6107
2017-03-30 13:59:12 +02:00
Tobias Hunger
5afc149b69 ProjectExlorer: Match filenames only to find filetypes
Do look at filenames only to decide which filetype a file is.

Change-Id: Ie64ad0a91df1ddd22c1cec4089f2611030560f3e
Reviewed-by: hjk <hjk@qt.io>
2017-03-30 11:36:57 +00:00
Christian Stenger
a59f209bb3 QmakePM: Fix executableFor() on macOS
Ensure that target is not empty and avoid storing a path instead of
the real executable.

Change-Id: I408a54befbbb7004773d04f4bdd3898469efbaa7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-30 10:41:04 +00:00
hjk
61b6aa5c84 iOS: Adapt to introduction of ProjectExplorer::ToolRunner
Change-Id: I53201edb58485c697c8c56db68ddefd3cf107193
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-03-30 10:11:48 +00:00
hjk
eee51e8c1d Android: Adapt to ProjectExplorer::ToolRunner introduction
Change-Id: I71cc25ef3daa0eee51a4c94285174e0f3b45d41f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-03-30 10:11:02 +00:00
hjk
c69b6f0ea9 Qnx: Adapt to recent ToolSupport introduction
Change-Id: I5daa28d3fe24f196195396c674e36e0709e77046
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2017-03-30 06:02:22 +00:00
Ulf Hermann
0683281b7b QmlProfiler: Load notes data only after models are available
Change-Id: I1ee13c842a07962d9aec93aaab6959614d7d8a08
Task-number: QTCREATORBUG-17936
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-29 15:05:59 +00:00
David Schulz
68ac850fe6 Debugger: Fix command setting active frame
Using this command without prefix and with the 0n decimal prefix
resulted in unreliable frame selection. Last chance is the hexadecimal
prefix.

Change-Id: I935d88849eb541534d4f311ac6059bcd35aee62c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-29 12:39:25 +00:00
Christian Stenger
e0cb69745b AutoTest: Fix handling of Qbs when searching for BuildTargetInfo
Amends 124efb32 - this special handling got lost between patch sets.

Change-Id: Ic94145d3310668f1c63abe5443e0d833850227a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-29 12:39:09 +00:00
Christian Stenger
4fbca421bd AutoTest: Fix senseless error message
Change-Id: Ie88b5f6c0d1fe933cd43dfde2f04c76590552a58
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-29 12:31:31 +00:00
Ulf Hermann
749b5a5098 Timeline: Use ScrollView's rather than Flickable's width for scrolling
The Flickable's width does not include the scrollbar, which may appear
and disappear, depending on contentWidth, and confuse the timestamp
calculations.

Change-Id: I6d516e6149ee64a129a1393a0780734484354147
Task-number: QTCREATORBUG-17940
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 12:19:31 +00:00
hjk
15867a9518 ProjectExplorer: Further orthogonalize Target/Tools
This introduces a 'TargetRunner' base that it meant as a base
class for classes like the current AndroidRunner, IosRunner,
WinRTRunnerHelper, similar to the existing 'ToolRunner' class
taking care of the tool bits.

This makes a RunControl only responsible for state management
(start/stop control), application output and general user
visible display tasks, delegation most of the real work either
to the the target or the tool.

The usage pattern for creating a run control is now

RunControl *RunControlFactory::create(...)
{
    if (barToolOnFooTargetIsSupported()) {
        auto runControl = new RunControl(runConfig, runMode);
        (void) new FooTargetRunner(runControl);
        (void) new BarToolRunner(runControl);
        return runControl;
    }
    ...
}

The pattern can possibly be simplified later, for now the goal
is to make it uniformly used.

As first use, "split" SimpleRunControl into a SimpleToolRunner
(which happens to be all its previous non-(Base)RunControl bits)
and the run control bits (its RunControl base).

This will make the SimpleRun*Control* class as such vanish again,
keep it for now to give downstream uses (Qnx/Boot2Qt) some time
window to adapt.

Change-Id: Ifafed4d0577466186280ac5014f4ad9eec78c56c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-29 12:02:05 +00:00
Tobias Hunger
14f3a86cf3 Project: Set filepath on ContainerNode
This fixes search via the context menu.

Change-Id: Ie675cae3f6e35d5d02234f3a49f7a71d02b08bc2
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 11:54:05 +00:00
Tobias Hunger
b0c7bb0f7b Project: Move ProjectDocument setup into Project class
Change-Id: I5c0ec79ddf066e37660fb9a6b24f9d882355d511
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 11:53:24 +00:00
Tobias Hunger
6829e33dc2 CMake: Move headers into their own folder in server-mode
Move all project headers into one folder. This reduces the time it
takes to generate the project tree, since the headers will only show up
once now (instead of once per target), severly reducing the number of
nodes in the tree.

Change-Id: Ibcfa7c02c1aec4a98054f4f8a97b69dfb4c25ae4
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 11:53:11 +00:00
Tobias Hunger
348aa12eaa ProjectExplorer: Provide ProjectDocument and use it in all projects
Change-Id: I6e054ebf1043bd1f6748f1567f35c68394bd6528
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 11:03:34 +00:00
Eike Ziller
06250531db Simplify Utils::transform (again)
Change-Id: I14690b55e9eeeac0aff243a6dfd6b83e7325179b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
2017-03-29 09:05:42 +00:00
Przemyslaw Gorszkowski
163b2c027d Beautifier: added support for fallback-style option for clang-format
Task-number: QTCREATORBUG-17813
Change-Id: I36adee4889d1b851171d34852eed29639c68b574
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 08:35:24 +00:00
Thomas Hartmann
df64242ab2 QmlDesigner: Remove dead code
Change-Id: If0eb4e662a50d2bb6b1a44649b73bd3c517dba48
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-29 08:23:23 +00:00
Thomas Hartmann
d882cb4a8f Utils: Adjust name fillWithZero()
The name was quite missleading.

Change-Id: I538eca2a59e8a861e707fecd8331488e1919408a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-29 08:23:14 +00:00
hjk
666648e997 BareMetal: Adapt to introduction of ProjectExplorer::ToolSupport
Change-Id: I61efb5a19181618504b85e07c97b3bc400d9d537
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: hjk <hjk@qt.io>
2017-03-29 08:11:25 +00:00
Tasuku Suzuki
2d196bd2a1 Move Session Manager... menu to Sessions > Manage...
Change-Id: If0f11c8c308069290174aa8cc6081108f9b448a1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-29 08:07:35 +00:00
Orgad Shaneh
6a725ebd41 Core: Do not warn about big file that is already open
This is especially annoying during debug, when each step pops this
warning.

Change-Id: Id309c881f6b3062bc140740fe22b5c90cfddd08c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-29 08:00:16 +00:00
Orgad Shaneh
74e570a858 Qmake: Add variable choosers where variables are parsed
Change-Id: I6203ebadbc934a7ae80ae1c5ca3cfad2471b787e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-29 08:00:12 +00:00
Tobias Hunger
75538aa060 CMake: Speed up extra compiler processing a bit
Makes extra compiler selection 30% faster on my test project.

Change-Id: If78084ce4a5a93140598dd19e8448295ca122863
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-29 07:54:01 +00:00
hjk
fd8df8cff2 WinRT: Base WinRTDebugSupport on ProjectExplorer::ToolRunner
Change-Id: Ic4985d5eeee1af74a6f42b2b1df890450936f6f9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-29 07:41:16 +00:00
David Schulz
d0ee83768c Debugger: Reset expression syntax after evaluate
Fixes setting breakpoints after using python dumpers.

Change-Id: Ifd917526e91c73f82f943645e1d1d11790369179
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-29 07:05:28 +00:00
hjk
246c33ccba TextEditor: Avoid warning about unused parameter
Change-Id: I3f04f378330df85b8da3574d4bad2d74c4a4f4c7
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-29 05:56:02 +00:00
Jarek Kobus
cd2a70c867 Remove unneeded includes
Change-Id: I83a6dc6ba33f7f8e1f6b1babbf60c69554435a0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-03-28 19:13:42 +00:00
Eike Ziller
6dd428849a Guard against infinite loop in pathOrDirectoryFor(Node*,bool)
QFileInfo::absolutePath prints a warning and returns an empty string, if
given an empty string for the file path.

Task-number: QTCREATORBUG-17927
Change-Id: Ie49fc1500937c00ba579281785435e57464639ae
Reviewed-by: hjk <hjk@qt.io>
2017-03-28 15:43:27 +00:00
hjk
2a1e7cb9f5 RemoteLinux: Base AbstractLinuxRunSupport on PE::ToolSupport
This continues the quest started with eb0b0f944.

This also moves the AnalyzerRunControl::starting signal to the
base, similar to the already present started and finished
signals. Moving emission of the signal to the base is left
to a follow-up patch to keep this here small.

Change-Id: I12e04823df22e7667a4d0a9ee7412153180c60cc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-28 14:50:05 +00:00
Jarek Kobus
9774f11738 Support diff a file from project explorer against the current file
Task-number: QTCREATORBUG-9432
Change-Id: Ie370bbffdb67dac520f392a73c1358f887157806
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-28 14:36:54 +00:00
Orgad Shaneh
ecacea18cb QmakePM: Fix toolchain executable comparison
Change-Id: I8fef9cb990be561cc822b33e772715895bbca6ca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-28 13:58:44 +00:00
hjk
b0117cdfb4 QmakeProjectManager: Remove unused QmakePrifile::buildsFile()
Change-Id: Ia71e00036f5468415ffc2e5649efe96f3debbfc8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-28 13:25:59 +00:00
Robert Loehning
93ce31ebb6 QmlDesigner: Remove dead code
Killed by a7a29fa6d6

Change-Id: If2952d5904b9c688387d1f904cb1b9a8e819d7f7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-28 13:25:40 +00:00
Thomas Hartmann
ddad6866eb QmlDesigner: Remove warning widget from DesignModeWidget
The form editor is now handling even initial warnings.
There is no need for an extra warning widget in the DesignModeWidget.

Change-Id: Iac85c1968e8040ee5f11435fa2876ce2d152c194
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-28 12:30:25 +00:00
Thomas Hartmann
acd08f24b8 Utils: Use brace initialization instead of constructor and 0
Calling T(0) for value types can lead to unexpected results.
Using brace initialization ensures we use value initialization
or the default constructor.

Change-Id: Ic33b186eebb1b37017d425ffca9bcf5d26df31d4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-28 12:30:10 +00:00
Lorenz Haas
a5574bc802 Beautifier: Allow to define specific config file for AStyle
Change-Id: I3ea1a0bfb0f39d99606204a5699b01128138259e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-28 11:42:23 +00:00
Lorenz Haas
a9fb29e575 Beautifier: Fix tab order of Uncrustify's option page
Instead of defining a faulty tab order just let Qt do the job. The focus
jumped from "Use customized style" to "Format entire file..." instead of
to the combo box.

Change-Id: I33567d7cb6b8275a2b9a939c937a02d00f2f1bbc
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-28 11:42:11 +00:00
Lorenz Haas
217df49346 Beautifier: Remove code that has no effect
The file name will be overwritten by restore(), called from
UncrustifyOptionsPage::widget(), right after the initialization.

Change-Id: Ieed634f351a7b3e79ed9327878534e69a8de7e95
Reviewed-by: Laurent Montel <laurent.montel@kdab.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-28 11:41:59 +00:00