Commit Graph

54723 Commits

Author SHA1 Message Date
Thomas Hartmann
180653128f QmlDesigner: Reset error messages wehen restarting puppet
We store generic error messages in the root node.
Those have to be reset.
Also we have to reset the type icon if there is no error anymore.

Change-Id: Ibe6274f651113f26aef6240bb9efa005862378f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-04 07:39:15 +00:00
Alessandro Portale
f23e454370 ProjectExplorer: Small welcome page improvement
Use the complete height of the (unexpanded) session label for the click-
to-open region. Also, give some magic numbers a name.

Change-Id: Ie972d669cca943105cdd2e7e99394b61ca0a6e37
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-03 14:06:12 +00:00
Christian Kandeler
f1b50837e4 Update qbs submodule
To HEAD of 1.8 branch. This update is needed to be able to build
Creator from Creator again.

Change-Id: I0d9840e98ee347b7c3233d59fd3a7ac0daeaab24
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-03 12:58:50 +00:00
Thomas Hartmann
5ee452aa9f QmlDesigner: Ensure proper current text editor in edit mode
When changing back to the edit mode we have to set the
edit modes text editor as the current editor.

Change-Id: I0bf7edbdf66285443402e2196f8ba655661e6dc4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-03 12:52:36 +00:00
Thomas Hartmann
081bbc440e QmlDesigner: Handle missing type information
We always had the problem that the design mode might become
active while type information is still being loaded.
This causes an error message and the user had to trigger
a reload of the QML document.
Due to changes in the project management Qt Creator
starts reading the type information, once the first QML file
is opened.
This triggers the error far more frequently.

This patch fixes the issue by triggering a reaload after 1s,
if type information has not been read completely.
This fixes the issue.

Change-Id: I23ad011294044690fd582e808227c3ccde8bda54
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-03 12:52:27 +00:00
Tim Jenssen
7e6d88ed49 QmlJSEditor: add some overrides to QmlJSOutlineWidget
Change-Id: I6053900493728433a5631f5aa6f1e3e967e270e9
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-04-03 12:28:58 +00:00
Tim Jenssen
99f2fc9b45 QmlJSEditor: use direct member initialization
Change-Id: I03aada10107a9d80d920d18c92df7ec36e6a22d4
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-04-03 12:28:49 +00:00
Tim Jenssen
cff6a97a9b QmlJSEditor: add missing class forward
Change-Id: Ic2f7c8e9366f86f6f768cc21a060112f25c31278
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-04-03 12:28:41 +00:00
Thomas Hartmann
6f1d23711d QmlDesigner: Keep background color in integrated text editor
Applying a .css style overrides the text editor background color
from the theme.
To avoid this we cannot apply any .css on the integrated text editor or
its parents:

 * Only apply the center widget .css to the tab bar.
 * Apply the scrollbar.css only to the scrollbars.

Change-Id: Id9b009a208ea2830c64be8174dbb548ada692560
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-03 12:23:02 +00:00
Robert Loehning
5b9450a3d3 Squish: Remove workaround for fixed bug in tst_simple_debug
Change-Id: Iad0fd8fb2a591dce86ebc05fc0d32e828193e298
Task-number: QTCREATORBUG-17492
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-03 12:12:13 +00:00
Orgad Shaneh
ed8fdec74f MSVCParser: De-noise
* Use namespace Utils
* Remove Q[Latin1]{String,Char} explicit conversions
* Fix indentation

Change-Id: I045ebb8b8d6893398b3c86009693bf18169a56ab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-03 11:56:30 +00:00
Orgad Shaneh
6ffabeec07 MSVCParser: Support "note" lines
main.cpp(7): error C2733: 'func': second C linkage of overloaded function not allowed
main.cpp(6): note: see declaration of 'func'

Change-Id: I46bbc86add628e7eadd5930ddf2fe9518b9e7adf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-03 11:56:05 +00:00
Orgad Shaneh
7fce93d7a7 MSVCParser: Minor cleanup
Change-Id: Ieae5f68eb6c881d71570bfe5d5670fc4085ac575
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-03 11:42:53 +00:00
Orgad Shaneh
0ceb734b5b ProjectExplorer: Fix crash when deleting 2 files
Task-number: QTCREATORBUG-17961
Change-Id: I167d75ef5ab4e64c518913887d0aeb2fba6c0d65
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-03 11:37:10 +00:00
Marco Benelli
f8688a478e QmlJs: update test for VisualItemModel
Change-Id: I6402e3870b3103e8c0423ecb6f064d050367d8ad
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-03 11:33:36 +00:00
Marco Benelli
592262ecdd QmlJs: test for delegate in ListView
Change-Id: Ifce93261fb2a532213cd011b7923f1ca38f00f6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-03 11:33:22 +00:00
Tobias Hunger
a3be2c08ee CMake: Fix clean target
Always list a "all" and "clean" targets and remove the similar code
in the tealeaf reader.

This fixes the clean-step falling back to "all" in server-mode.

Task-number: QTCREATORBUG-17138
Change-Id: I1ce84f03c2e9829e4bb5f550c10cdef772fabf5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-03 11:21:47 +00:00
Ulf Hermann
5605337f6a QmlProfiler: Improve robustness of flamegraph view test
If the context menu disappears for whatever reason, just open a new one.
Making sure that the context menu stays around when we don't do anything
is not Qt Creator's job, so we don't have to test for it. Also, when
trying to remove the context menu, click a spot that's certainly inside
the screen.

Change-Id: If6e574d84bedf2ab552c8c29d756501e9d2282bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-03 08:49:19 +00:00
Orgad Shaneh
aa80b23f99 ProjectExplorer: Replace hard assertions with soft ones
Task-number: QTCREATORBUG-17961
Change-Id: I8f0aa0382b21ea7923cb1d4396833b33b226a247
Reviewed-by: hjk <hjk@qt.io>
2017-04-03 07:23:37 +00:00
Orgad Shaneh
173cb9f20e QbsPM: Fix size_t -> int conversion MSVC warning (64bit)
Change-Id: Ib1f79c2e0e203c5cc6cfaadac0b3ae1ee09d88b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2017-04-02 05:08:16 +00:00
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
Andre Hartmann
785e183486 Changes-4.3.0: Fix new variable name and add bugreport numbers
The variable was named "CurrentRun:Runnable" in the first
patch sets, but was renamed to "CurrentRun:Executable" later.
Unfortunately, the commit message was not fixed.

Change-Id: I7084e85bb3f4eb8979b4a295bb96f47d62393375
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-31 07:10:44 +00:00
David Schulz
4e4b5833da Debugger: Fix QFlags dumper for cdb
Also adding a test covering this dumper.

Change-Id: I491dd87e52f65bf3faf21d81436f264507bf0b51
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 13:37:53 +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
Eike Ziller
77135a342f macOS: Fix deployment of clang helpers
They worked but still had wrong, additional rpaths
to the Qt they were built with.
Remove handling of ClangCodeModel which doesn't link to clang
anymore.

Change-Id: I5c1fa59b3659dc8205b782fa8aac8b700b17a98a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:05 +00:00
Eike Ziller
3af815089c deployqtHelper_mac: Add helper variable for resource path
Shortens strings

Change-Id: Idba3130e07ec99ecd370a75a2bd257223ce1f966
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:00 +00:00
Eike Ziller
efe2bf73af macOS: Fix deployment of qbs_processlauncher and qbs-create-project
Change-Id: If38d11b452dc37dc3a5694c57d43a7a4e1635904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:47:54 +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>
v4.3.0-beta1
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
Ulf Hermann
186f0f574a Timeline: Fix timelinerenderer test
The events in question are overlapping and all match the given
timestamps exactly. As we stop the search whenever we find an exact
match, the results are valid.

Change-Id: I705bfbdfe9105927588cc356e29209bf893a9ed6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-29 12:03:45 +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