Commit Graph

50929 Commits

Author SHA1 Message Date
Thomas Hartmann
1e5706c085 QmlDesigner: Fixing warning
Change-Id: Ia1c57252adac80f4f6ff1599b606c7a8588aed14
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 12:56:52 +00:00
Nikolai Kosjar
624bfeb70b C++: Remove concurrent access to TemplateNameId
The modification of the TemplateNameId changed "global state" because
the TemplateNameId is potentially accessed by multiple threads doing
lookup (access to same document and thus same symbol names).

Depending on the thread scheduling and access to
ClassOrNamespace::_specializations, the changed TemplateNameId
"suddenly" led to inconsistent results of TemplateNameId::Compare and
thus broke the std::map assertions.

Get rid of the const_cast, the setter and simply construct a temporary
TemplateNameId with isSpecializaton = true.

Task-number: QTCREATORBUG-14911
Change-Id: Ie381d132cc0d06af351ace4257773637d1ebee4e
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-04 11:45:33 +00:00
Thomas Hartmann
6494278d70 QmlDesigner: Fixing raise condition in the drag tool
We only skip the update, if the instance already has a valid parent
and the form editor is currently bypassing the puppet to handle
parent changes.

This avoids the form editor getting into an invalid state if this event is
handled (too) late.

Change-Id: I518b0f5a402a3ae55320028cfeb2d47f12418e38
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:42:03 +00:00
Tobias Hunger
4c3885a584 CMake: Polish TeaLeafReader
Change-Id: If379e1d53f2da61dccb1e72ea1a516e3bd788b60
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:21:29 +00:00
Tobias Hunger
69b378eb73 ProjectExplorer: Expose sortByPath operator on project nodes
This is universally useful, so expose it.

Change-Id: I9cceee076397c7d690d8d34ef8ac815059e4454d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:20:56 +00:00
Tobias Hunger
fdfe55c992 ProjectExplorer: Make NodeType const in Node class
Change-Id: I04b31f73a76ce47dc53e8cffd7ea0cbe7c8e4e08
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:20:36 +00:00
Tobias Hunger
5d66526910 SDKTool: Remove debug code
Change-Id: I9aa2e3deb924a60de013fb648d59807ebd1f0bb0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:20:19 +00:00
Tobias Hunger
708cb1301f CMake: Do not warn about UNINITIALIZED variables
This so called type is not documented to exist but apparently widely used.

Change-Id: I0a7693e19874887a6e7260964d119d204e5be1ec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:19:30 +00:00
Thomas Hartmann
4d8c8d016a QmlDesigner: indent only the component
If we indent lines that are also part of the surrounding component,
the offsets of the component become invalid. This was crashing.

Change-Id: I80f16c916fabd5b49a0d8ba87989c86727c97c50
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 10:15:28 +00:00
Jarek Kobus
05747d7d33 Don't shout in text messages
Change-Id: Ie8d2c6761c87b358f0bc8691e529ba8144e267a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-04 09:51:29 +00:00
Ulf Hermann
d771ba8921 Debugger: Don't clear unrelated views when updating locals
If the list of partial expressions is empty we need to tell the watch
handler that we are only updating the locals view, not e.g. the
inspector view.

Change-Id: Iedc74ffc66a8435faa272d053849b831f6b8cbbe
Task-number: QTCREATORBUG-16692
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-11-04 09:35:10 +00:00
Jarek Kobus
d8c6b2d434 Clarify comments on linguist file types
Change-Id: Iefe9238f7ae5d3646017918a3efdd84864800881
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-04 08:53:48 +00:00
Leena Miettinen
8ab3d91afd QML JS: Add missing space in UI text
Change-Id: I25e525216bb6ad07c5491c7e9660c7d9becad1d4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-04 08:36:10 +00:00
Jarek Kobus
0ed954ca76 Use tr for plurals
Change-Id: I22e7cd13a8bd20789e83945d99d5d57fd1eee392
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-04 08:28:58 +00:00
Jarek Kobus
8ed09cfa8e Fix apparent typo
Change-Id: Idd9b4a708aa8aa966da4d920b17d81c08f4d722b
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 19:03:42 +00:00
Alessandro Portale
c110eac3ec ProjectExplorer: Introduce a small device status icon
Device status overlay and the device status display should be two
separate icons. This change makes it happen.

Change-Id: I3a965fdb8b74c447a5cf80e4c90a3ae06c91b3bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-03 17:08:39 +00:00
hjk
7dbc62a182 Debugger: Robustify special argv detection
Check for Pointer(Pointer(Char)) instead of a 'char **' name
which fails to match 'char**'.

Change-Id: Ie3d523924e64156a32df6db5c87997bb88f125a1
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 16:30:13 +00:00
Tobias Hunger
7150c0778b ProjectExplorer: Allow for disabled nodes in the project tree
Change-Id: I82d8284777f5691eb3ba9cf4ef92da05057aac18
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-03 15:56:16 +00:00
Tobias Hunger
ce3e586198 ProjectExplorer: Shorten space needed to store a FileType
Use class enum to shorten the FileType to quint16. This frees up a couple
of bytes per FileNode and we can have many of those.

Change-Id: I3a9ae25059690fefa15305a4268269647d6dc1c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-03 15:55:39 +00:00
Tobias Hunger
c9ee7ee378 ProjectExplorer: Shorten NodeType enum
Use a class enum with a type quint16 for the NodeType. Frees 2 bytes
per node that can be used for better things now.

Change-Id: Ib84bf8629e9f4a5fb0793355eff0f0d6302167dd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-03 15:55:13 +00:00
Ulf Hermann
fc80a5afb4 Debugger: Implement QmlEngine::doUpdateLocals
This allows us to sort the locals by name immediately when the action
is triggered.

Task-number: QTCREATORBUG-16645
Change-Id: Ifd24f49e66523af5e988065c9a33aae00e7fb290
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 15:38:07 +00:00
Ulf Hermann
f94bb76eac QmlInspector: Refresh the view when SortStructMembers changes
This has the effect of sorting the members immediately, rather than
the next time something else changes.

Change-Id: I3f3cb261f1fb69b6b36914b811a431b045bb49ae
Task-number: QTCREATORBUG-16645
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 15:13:27 +00:00
Ulf Hermann
4317546faf Fix QnxDebugSupport::startExecution()
Under the assumption that the QNX debug support should work similar
to the RemoteLinux debug support we have to:

a, use the Runnable provided with the run control
b, not recycle the arguments from the run control start parameters
c, prepend a new set of QML debugger arguments when QML debugging

There seems to be some mechanism that allows us to do C++ debugging
by simply starting a process "pdebug <n>" for some port number <n> on
the target. We don't touch this here.

Task-number: QTCREATORBUG-17208
Change-Id: I0f4541968e1d20940617e8ff6d16a8ad86ea22c9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2016-11-03 15:11:11 +00:00
Tobias Hunger
6486cc8127 ProjectExplorer: Fix possible use-after-free in Project combobox
Make sure the combobox values are set to null. Otherwise the ComboBoxItem
might try to read from that value while it is being removed from the model.

Task-number: QTCREATORBUG-17223
Change-Id: I6588aaddf39736846878593a8e6844dab96de408
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 14:34:22 +00:00
Leena Miettinen
290743fdd6 Doc: Describe synchronizing diagrams and Structure view
Change the UI text to use the name of the Structure view
instead of "Browser", which is a term not used in the documentation
or the model editor UI.

Change-Id: Id5654bc7f5c4a9c7147315333f60c88a9e667bbc
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-03 14:32:14 +00:00
Leena Miettinen
8d4eb164e8 Doc: Zooming into and out of diagrams in model editor
Change-Id: Iac64a39386b2dbedf58ec2b1c9f7f4789786c289
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-03 14:07:54 +00:00
Alessandro Portale
68115440f0 Utils: Move the breakpoint icon mask from Debugger to Utils
A filled circle can be used for other icons as-well.

Change-Id: Ifed0dda111ccb92fa5bb44d63f1c23af1137121a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-03 14:07:47 +00:00
Kai Koehne
b081c2f7b1 Preserve non-ASCII characters in MSVC environment
For the MSVC compiler we parse the environment variables from the
output of a 'set' call. So far we didn't enforce any encoding, which
means that the current code page is used. Then we tried to parse this
with QTextCodec::codecForLocale, which is not necessarily the same.

Avoid this by forcing UTF-8 as output (code page 65001),
and parse as UTF-8.

Task-number: QTCREATORBUG-17219
Change-Id: Ia1a6fa56e5c3e1599bf545795c655bf9376bae5c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-11-03 12:44:27 +00:00
Przemyslaw Gorszkowski
39d85833b5 GitGrep: fixed substitution of regexp
Task-number: QTCREATORBUG-17193
Change-Id: I7e11a5a55f373dce98a9e203bb3bcb5e929174fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-03 10:35:59 +00:00
Tobias Hunger
9b0b6aad2e QmakeProjectManager: Remove dead code
Change-Id: I279fb21a8da8789b19e4319b804afafdeb6a630d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-03 09:44:35 +00:00
Ulf Hermann
2acedc82c5 iOS: Don't initialize invalid ports with 0
The invalid port is -1, and Utils::Port does not need an explicit
initialization.

Change-Id: Id545fb98677d26541aa89611ddd50b735e08530a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 08:31:35 +00:00
Michael Dönnebrink
ed6abae46d QmlJSEditor: Add option to automatically format QML/JS file on save
Change-Id: Ide1810efdef98595705daa32c83fecc2ad367a49
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-11-02 19:38:38 +00:00
hjk
1574f9cfca Debugger: Remove 'const' from more types again
Change-Id: I95e02a462e3b7614342e1515c96290a954d27dca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-02 16:17:53 +00:00
Christian Kandeler
2b7615548d iostool: Fix warning in qbs build
The bundle.infoPlistFile property does not exist anymore. A file tag
based approach is being used these days.

Change-Id: I5b73facb5397a28c0c40f1745c82225c24ffba9d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-02 15:57:22 +00:00
hjk
3be260ecc5 Debugger: Replace 'first base' guessing logic
Use the fact that the order of the first three vtable entries of a
QObject is fixed and the size of their implementations is roughly
known.

Change-Id: I3d13f594cb1c1f162a520da18b2bc2aaba852092
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-02 15:11:32 +00:00
Orgad Shaneh
410211e090 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ibb932efece05a5f5613823fbc79c5b7601c73905
2016-11-02 16:52:58 +02:00
Alessandro Portale
63bed77178 VxWorks: Themable and HighDPI-able icons
Change-Id: I3d4d98bad3e00c0b34009595e9a449c7897d59e2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-02 14:13:01 +00:00
Oswald Buddenhagen
cd30304685 fix cumulative qmake evaluation in debug_and_release configs
don't fail to make the build pass evaluator cumulative as well.

Task-number: QTCREATORBUG-17214
Change-Id: I217578b7d29d0dcf9ef63c954ec403412812c70c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-02 13:59:52 +00:00
hjk
8bf8b5f61f Debugger: Make dumpers work for Qt 4 again
Change-Id: I78ac75161508eb6889d1a8a5d04df2860804b907
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-02 13:01:47 +00:00
Alessandro Portale
d47c0e52c0 Boot2Qt: Themable and HighDPI-able icons
For Emulator, Hardware and "Start VM"

Change-Id: I7244f6a56c62767aacdb19b818865359bfe91191
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-02 12:53:14 +00:00
Tim Jenssen
7b70c30750 Utils: fix that utils can be used in tests
Change-Id: I1f530f3f63e22719de6faed7f55c66282d4044e8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-02 12:25:20 +00:00
Tim Jenssen
0e7103ede6 Revert "Clang: Replace macro usage with HostOsInfo"
This reverts commit cbdf673696.

It introduce a dependency to utils for a couple of lines,
so it is not worth.

Change-Id: I2f53ff3f63322719de6faed7f55c66282d1044e8
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-02 12:25:12 +00:00
hjk
b0da1e3ce4 Debugger: Fix display of vtable entries
Task-number: QTCREATORBUG-17050
Change-Id: I17fc245a8a766f3a450c0bea966aab69ca9eb5b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-02 12:24:50 +00:00
hjk
4af72f0b5f Debugger: Make core file name publicly accessible
Task-number: QTCREATORBUG-17158
Change-Id: I528dcd2540479aa34e04d057db1636dbe75c21b6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-02 12:23:21 +00:00
Orgad Shaneh
7ccc5803dc Dist/GDB: Upgrade to 7.12
Include a patch for MinGW

Change-Id: I3bbed52e92b5ae657debb5b6045da31274ccf6c5
Reviewed-by: hjk <hjk@qt.io>
2016-11-02 12:07:33 +00:00
Orgad Shaneh
e4086f4532 Dist/GDB: Upgrade expat to 2.1.1 also on linux/osx
Expat 2.2.0 fails to build on MinGW, so for now we
won't use it.

Change-Id: I1b3ffda62e1a6edfb3aa224bc9943a1806d52335
Reviewed-by: hjk <hjk@qt.io>
2016-11-02 12:07:28 +00:00
Tobias Hunger
49f2d760e3 ProjectExplorer: Either a API is worth having or it is not
Get rid of "test-only" markup.

Change-Id: Ic0fdfa0c863f22d4422b416d295e2953f7daa860
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-11-02 11:17:58 +00:00
Orgad Shaneh
2ef3a44fdc Revert "Tests: add utils dependency"
It breaks compilation (at least on linux).

Anyway, HostOsInfo::isWindowsHost is header-only, and should not require
this dependency.

This reverts commit e3a2f3c796.

Change-Id: I8bd86d978742bdb7db3d9f8d429a4803be22a779
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-02 11:16:33 +00:00
Eike Ziller
583d8ced5a Theme Settings: Fix that options page switched back to current theme
- Changing the theme settings and reopening options page switched back
  to current theme
- When passing a theme on the command line, closing the options dialog
  would state that the theme change takes effect after restart, even if
  theme was not changed

Fix these issues by showing the current theme setting in the options
page, ignoring the currently active theme, and showing a label telling
the currently active theme instead.

Task-number: QTCREATORBUG-15852
Change-Id: I343fc729c33f17fcb15a8e9facd7a49076d0e0d1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-02 11:10:26 +00:00
Eike Ziller
05bf915c03 Core: Refactor argument handling
Split up getting the data from the arguments list and actually applying
the values, and move the details of theme creation and application to
better places.

This gets rid of ugly control flow details like that
CorePlugin::initialize created the action manager before calling
parseArguments, because that is needed to apply the presentation mode
argument setting, and parseArguments created the main window because
that needs to be created _after_ setting the theme (which can be
overridden by command line argument), but _before_ applying the override
color argument setting.

Change-Id: I9c99305b6efbfcc4b37cea9e5c70d816a621963b
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-02 11:10:18 +00:00