Commit Graph

50929 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Eike Ziller
1da65616b9 Add change log for 4.3
Change-Id: Ibf790b4a93fc83bb432f5b37d72aa7048acc1681
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-28 13:23:39 +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
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