Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
3492da1246 ResourceEditor: Prevent possible nullptr access
Change-Id: Iad958d26272f471530a8494bee0e326ce9835aa9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-24 11:16:12 +00:00
Nikolai Kosjar
1074d97432 Clang: Avoid fragmentation in diagnostic display
A "diagnostic row" is displayed in two columns with the help of table,
one cell being the location, the other cell the diagnostic text. At
times, the location is wrapped too, which makes the whole diagnostic
display look fragmented/broken.

It looks like there is no way to avoid the wrapping of the location
column because Qt's CSS does not support the needed

    style='white-space:nowrap'

Avoid the columns for a consistent display at all times.

Change-Id: I35e4a1c831f18e2bce6a4c9ed891fcae439d1a1b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-24 10:52:12 +00:00
Nikolai Kosjar
dca76c9889 Clang: Leave space between category and option in diagnostic display
For some diagnostics ("#include_next is a language extension"), the text
has a smaller width than the category and option together. In this case,
there is no space between category and option, which looks terse.

Change-Id: I27e4736a0d2aa527d5733c6115bc8d40fe7794e0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-24 10:52:06 +00:00
Nikolai Kosjar
7d39f94f3d Clang: Avoid warnings about unknown pragmas
Task-number: QTCREATORBUG-17460
Change-Id: Ic57f59f87b58c44ac738fb87039b4844d82bc924
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-24 10:51:43 +00:00
Tobias Hunger
d5f242f3d6 Qmake: Do not warn when a compiler misses an .exe on windows
Task-number: QTCREATORBUG-17489
Change-Id: I8fbbf48b41b84adf8905d81ae21ded4ed2fd541d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-24 09:45:52 +00:00
Nikolai Kosjar
535cc76cac Clang: Avoid dot-arrow-correction if dot is gone
Change-Id: Iba23a17ba9345ed4f08e16faad02054903c04afc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 17:26:06 +00:00
Alessandro Portale
a9012ce747 QmlDesigner: Provide proper form/text editor split icons
Change-Id: Ic52197afb7a6bd381d95ec3a63ef2dfef8aaf5c3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-23 17:19:26 +00:00
Thomas Hartmann
b3763d9496 QmlDesigener: Remove C casts
Change-Id: I66317b46d7463545961f01b06baadf48470334ec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 17:10:21 +00:00
Thomas Hartmann
c035cb81ce QmlDesigner: Fix warning
Change-Id: If8fe5c9f3db5f1927b9e2dd979a88ce97fdf88a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 17:10:14 +00:00
Thomas Hartmann
7d7c54fe74 QmlDesigner: Only show debug output if enabled
Change-Id: I6ad7c44c72ca7b87f3c119df33d01c561dd3d614
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 17:00:35 +00:00
Thomas Hartmann
95ecd506c1 QmlDesigner: Fix warning
We should avoid C casts.

Change-Id: Ib88dfab642a8f55bf81f428d4fe1cd59af1858da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 17:00:27 +00:00
Thomas Hartmann
9c12e0b7dc QmlDesigner: Fix warning
Change-Id: Idc3c8340b7eabef74d70bc0158307e464d5413ec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 16:41:19 +00:00
Thomas Hartmann
970496b24c QmlDesigner: Fix help
The designer used a over simplified lookup,
that did not distinguish between e.g. Controls 1 and Controls 2.
Instead of fixing the lookup we simply use the working lookup from
the QmlJSEditor.

Change-Id: I2d31e633eaadc67e211d44bad307b26993f21fc9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 16:41:10 +00:00
Thomas Hartmann
316ed6943c QmlDesigner: Fix setting size if anchors are present
To ignore width or height the item has to be anchored
on both sides.

Task-number: QTCREATORBUG-15915
Change-Id: I3f4595788a08c295be93b20ebfabd20eb4fe3a63
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 16:41:01 +00:00
Thomas Hartmann
0cfe9f5c72 QmlDesigner: Use logging category for debug output
Task-number: QTCREATORBUG-12973
Change-Id: Idbd0236f8bb3e25be75b572e8507af619427e385
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 16:27:34 +00:00
Ulf Hermann
bdecee9feb QmlProfiler: Add some sanity checks to the various models
If we pop an event from the stack, then it should be the same type we
pushed earlier.

Change-Id: If4389cb57fa8996b3772fefca92d27c33dc35c65
Task-number: QTCREATORBUG-17885
Reviewed-by: hjk <hjk@qt.io>
2017-03-23 15:16:14 +00:00
Tobias Hunger
572ea47e97 CMake: Fix project tree getting lost during reparsing
Fix the project tree getting lost after changing a cmake file. This is
due to the old set of files being used for deduplication, so no CMakeLists.txt
files got added to the tree, and then nothing could be added to those later.

Change-Id: I46989e0b802ab2a030d1922282361359837c41a4
Reviewed-by: hjk <hjk@qt.io>
2017-03-23 15:09:55 +00:00
Ulf Hermann
b609f2d9e9 QmlProfiler: Correctly process coarse-grained traces
If many events start or end at the same time, the parser would confuse
their order, resulting in meaningless statistics.

Change-Id: I05f94e694c16d6c22b6e937c2f979ce572a068d1
Task-number: QTCREATORBUG-17885
Reviewed-by: hjk <hjk@qt.io>
2017-03-23 15:09:15 +00:00
Ulf Hermann
01cb51c119 Timeline: Use Flickable's width for scrolling, not parent's
The parent width may get updated before the Flickable's, causing
synchronization problems. Also, we can keep the width/contentWidth
handling local to the Flickable now.

Change-Id: Ia7fe09a9526c23b7d2f1ab4149f0aa2bc8f3ffb7
Task-number: QTCREATORBUG-16700
Reviewed-by: hjk <hjk@qt.io>
2017-03-23 14:32:52 +00:00
Marco Benelli
24ff3a2cbd QmlJs: fix compile-time condition
The update of the qmljs parser changed the 'ifndef QT_NO_TEXT_CODEC'
condition to 'if QT_CONFIG(textcodec)' that causes a compilation
failure on some platforms.  Since QtCreator does not support development
against a Qt version without the feature, the condition is removed.

Change-Id: I18e69eee2b6996233562fbfcf7f29ad619911d8b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-23 14:30:26 +00:00
Alessandro Portale
43ea2f2d82 ProjectWelcomePage: Revive the expand arrow hover effect
The <= 4.2 welcome screen had a separate hover effect for the expand
arrow area. Let's have this back.

Change-Id: I5f03092420b488f2a847ca6c50d81368c8a3c9aa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-23 14:13:15 +00:00
Orgad Shaneh
0ba2706f54 WinInterrupt: Fix static linking flags
* The source is a C file, not C++.
* Release with debug info was not covered.

Change-Id: I868cf7415b93499c07249bd42dd91037382233c7
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-23 13:08:03 +00:00
Alessandro Portale
51bc50c71f QmlDesigner: un-swap lower and raise icons
Change-Id: I25043dac5fb82b087e6866be9a608c1d8ddfda26
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-03-23 12:54:54 +00:00
Alessandro Portale
ef5def1bd4 QmlDesigner: Improve lower and raise icons
They should now look less "disabled".

Change-Id: If871a393876ea47d139732b1935f72f4cf0eefa1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-23 12:52:09 +00:00
Max Blagay
213bfe9e9c Git: Remove "Sign off" shortcut from submit editor
The new "Sign off" option in Git submit editor had
the shortcut Alt+S, which conflicted with the shortcut
for "Diff Selected Files".

As "Sign off" will most likey be used seldom, the
shortcut is removed.

Change-Id: Id7763277da304834e9dc5d850272dd5fc207fcb9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-23 12:36:35 +00:00
Orgad Shaneh
8d3c886780 ProjectExplorer: Replace short functions with lambdas
Change-Id: If5f8c9a0a3256fb85acda944466f350400449865
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-23 12:34:28 +00:00
Thomas Hartmann
5593dc9d6e QmlDesigner: Apply .css only to tool buttons
This fixes the size of the tool buttons in the tool bar
of the form editor.

Change-Id: I06bda6beb59798b78e42d358107b511e9229107e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-03-23 12:23:50 +00:00
Tim Jenssen
637034c318 Clang: fix SEH exception
against the documentation nullptr is not working here

Change-Id: I6b5329ef97289370715faba8046724d5e42662ed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-23 11:34:36 +00:00
Alessandro Portale
7347bad4de WelcomeScreen: 1-pixel tweaks
Adjusting some font sizes and spacings to get the 4.2 look back.

Change-Id: I4f21626c7d44c635ec5c88a50bb19214a777ef66
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-23 11:23:44 +00:00
hjk
7022b784c6 ProjectExplorer: Fix project/subproject item context menu mixup
Off-by one negation introduced in ebae642.

Change-Id: I26701e170ea4e0dc18f114c6c032b8fa85fb4a98
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 10:36:52 +00:00
Ulf Hermann
c6e1bf6187 ScxmlEditor: Retain explicitly set "initial" attributes
If the user sets a state to be initial and then moves it around without
reparenting it, the initial attribute has to be retained. This is
achieved by saving a "removedInitial" attribute in the editor info when
the state is released from its parent and restoring the attribute when
it is reattached. This even works if the state is temporarily reparented
and across save/load cycles.

Change-Id: I65df959e4eb8d46177d59f71c8556d596e773c05
Task-number: QTCREATORBUG-17108
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-23 08:48:26 +00:00
Marco Benelli
61d30a20ce QmlJs: sync qmljs parser
The last version of the grammar contains some constructs that the code model
needs to know.

Task-number: QTCREATORBUG-17842
Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-23 07:50:26 +00:00
Orgad Shaneh
0c6d5d6aed BareMetal: Fix crash on shutdown
Change-Id: I40c2381f5d70d57c8bb7b6d4727a5350a52eefc5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2017-03-23 07:47:42 +00:00
Alessandro Portale
d31ba1a60e ProjectExplorer: Optimizations for ProjectDelegate::paint
Cache the "project" icon in a static variable. Don't fill the
background if not needed.

Change-Id: I84049c5392a12947db24e2cdf91e7cb5317b9f44
Reviewed-by: hjk <hjk@qt.io>
2017-03-22 17:07:34 +00:00
Orgad Shaneh
9fc68e07b5 QmakePM: Highlight QMAKE_C[XX]FLAGS_RELEASE_WITH_DEBUGINFO
Change-Id: I806878f447f2db836c3b56e534b6b6746c457187
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-22 16:32:48 +00:00
Tobias Hunger
fa6520ed75 ProjectExplorer: Do not try to add a nullptr to the project tree
Change-Id: Id6dedc11b9dac8be48fb579e171e4cec6efe1aa1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-03-22 16:27:59 +00:00
Orgad Shaneh
8ddfe96f76 iOS: De-slot
Change-Id: Id5a8c4eae641280197db2e24b603e1906a56429e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-22 15:36:24 +00:00
Christian Kandeler
7979dc70dd ios: Fix qbs build
Change-Id: I538fd0702f2677b1a1bd5ce9267f793ab5270f69
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-22 14:09:16 +00:00
David Schulz
26056cea41 Debugger: Cache copied values
Change-Id: Ia61cbc5b2ef76edebe1061b747591e5bfd2f0d8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-22 14:03:51 +00:00
David Schulz
2df831f530 Debugger: Do not cache default constructed values
Change-Id: I5b389902350abe2684cb26d262a22ce83330034b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-22 14:03:46 +00:00
Ulf Hermann
a985521b39 RemoteLinux: Always kill the whole process group
This way we can get rid of processes spawned from an initial shell, e.g.
in case of the perf profiler. Also, if your target application spawns
additional processes, we probably want to kill those. The kill -pgid
only works if the target application is actually the process group
leader. So, in case it isn't, also kill it individually by pid.

Change-Id: Ifcaf3764d21281c3cac107419f84f6bc527854da
Task-number: QCE-91
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-22 13:56:10 +00:00
Robert Loehning
00bb2425f5 QmlDesigner: Really prevent possible nullptr access
c163240611 added the check for
!projectNode but then used the pointer anyway

Change-Id: Ied63fd0991b0de1dab3d19cd57c00acd596bf752
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-22 13:39:28 +00:00
Orgad Shaneh
42e538d647 Locator: Signal added column and resize headers
Task-number: QTCREATORBUG-17899
Change-Id: If0b12d6c3b412437149a6ba0a9be34f7c0a983ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-22 09:29:02 +00:00
Eike Ziller
aa87ee72ec Merge "Merge remote-tracking branch 'origin/4.3'" 2017-03-22 09:27:56 +00:00
Eike Ziller
edee1e805c Merge remote-tracking branch 'origin/4.3'
Change-Id: I266a41de38789922363d1d88e73726cdca608920
2017-03-22 10:26:01 +01:00
hjk
2356483205 ProjectExplorer/QNX/RemoteLinux: Merge {RemoteLinux,Simple}RunControl
Currently still kind-of-two implementations due to the kind-of-two
current ApplicationLauncher message handling, but getting one step
closer to a unified implementation.

This also de-emphasizes the "wrong" QNX-IS-A-RemoteLinux relation
by removing the QnxRunControl inheritance of RemoteLinuxRunControl.

Change-Id: Iec8abaa53223a5a47ec51817b3994d37d444557a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-22 09:24:51 +00:00
Eike Ziller
26e76d3387 Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
	src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp

Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
2017-03-22 10:21:59 +01:00
hjk
991f5eb6a5 Prepare for upcoming compile breakage
Qt 5.9 is going to break source compatibility by making the
QStringRef(QString *) constructor explicit.

Since the use of that constructor rather looks unintentional
here, replace its use.

Change-Id: I6f5f2e79f7d92f6e80a1ea0aa12126d9c88b499e
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-22 08:25:13 +00:00
hjk
4d3c297d02 GenericProject: Code cleanup
Remove unused code from project node, access own members
directly, etc.

Change-Id: Icbffb4d3328757ffe3aa756ca1448fefba9bb00a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 17:23:58 +00:00
Thomas Hartmann
505cf814b9 QmlDesigner: Fix warning
Change-Id: Iaa207dec5ea869833750eb9fc18f70f404d08572
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 17:22:15 +00:00