Commit Graph

4946 Commits

Author SHA1 Message Date
Robert Loehning
11c9ee30b1 Remove "utm_source" from links
Change-Id: Ib898b31433ddbcc1e90e412e31cc4864fd705c8c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-02 15:12:04 +00:00
hjk
fdde69a5a5 Debugger: Add dumper for various QJson* classes
Needed to debug the QmlDebugger.

Change-Id: Ia0b50dac2146fcc81990b78eb8de30c8e763bba2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-02 06:58:04 +00:00
Thomas Hartmann
98c31cfcbc QmlDesigner: Fix compilation of qml2puppet for Qt 5.6
The internal API for bindings did change

Change-Id: Ia12e5d855911aedba1c78d6bb54c7f5892f65488
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-02 06:53:31 +00:00
hjk
1a04e06b45 Re-enable QmlProjectManager by default
Acting on user feedback.

This essentially reverts commit 7e8fb3a9e9,
but demotes the wizards from "Application" to "Project" and adds
a tooltip in the hope to make "accidental" use less likely.

Change-Id: I385bcfc5cdcb9bb3c36f9168a7fc6480f4fc5062
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-07-02 06:46:46 +00:00
Tobias Hunger
6b6091ea61 Replace several "Plain C++" with one JSON wizard
Change-Id: Ia08f2127cdb25785cf313ec0a31a3d9775161c9b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-01 13:45:01 +00:00
Tobias Hunger
d41c634be0 QtQuickWizards: Fix versions and make minimum Qt version work
Task-number: QTCREATORBUG-14575
Change-Id: I9ace40e71b8b1d1f753966bb73f0269c4f918afa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-25 14:13:19 +00:00
hjk
f886c70199 Debugger: Be more robust in case of unexpected non-ASCII output
Also correct typo in function name.

Task-number: QTCREATORBUG-14629
Change-Id: I193efc3a002f83b0091f93e087f2feb19dc4f5c1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-25 11:37:18 +00:00
Nikolai Kosjar
4eafa2e02b Clang: Handle Q_ENUM() and Q_FLAG() in qt5-qobjectdefs-injected.h
Q_ENUM() and Q_FLAG() were added in Qt 5.5.0.

This fixes among others red/wiggly underlines of these macro's uses.

Change-Id: I059ebcc32cc271f4960b11e722e23c314c5ceac7
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-24 10:09:26 +00:00
Nikolai Kosjar
b7c025a5dd Clang: Respect QT_NO_*KEYWORDS in qt5-qobjectdefs-injected.h
Change-Id: I299db813c13f273a40e447c5fdde8ff8757480ba
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-24 10:09:21 +00:00
Tobias Hunger
e509441e4f JsonWizards: Only show wizards with Qt versions that support them
Task-number: QTCREATORBUG-14216
Change-Id: I7e9e760f7ba9ef6022e76f1600e473a5f54c9893
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-17 11:29:39 +00:00
Tobias Hunger
0c2b1287c4 JsonWizard: Make minimum Qt version work
Task-number: QTCREATORBUG-14487
Change-Id: Ic858b131abb2802cb7bfedf58f64c644ea2085e5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-17 11:28:56 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
2015-06-17 12:04:21 +02:00
Jarek Kobus
f7c98fa6ab Replace assignment of null QString() with a call to clear().
Looks like it's a kind of rule in QtCreator code.

Change-Id: I92fb60055273d66d6e459245836df5b90d7a3cc6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-16 12:07:31 +00:00
Marco Benelli
427170e504 Fix import autocompletion
Added latest version of QtQuick and Controls.

Task-number: QTCREATORBUG-14563
Change-Id: I0cc412c28cd7ceb507f5ce222d8dcc3a05c23e26
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-06-16 11:33:24 +00:00
David Schulz
c82d287cbf Editor: Highlight Search results in scrollbar.
Change-Id: I999ddeeedbd6bdd7abebf75405d7e9281a1893df
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-16 09:02:14 +00:00
David Schulz
92c902c70c TextMark: Adjust color for improved visibility in the scrollbar.
Change-Id: I62a5e055942838c340ec7db8cd62a0b4e685acc5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-16 09:02:00 +00:00
hjk
60eacb7790 Debugger: Allow hex values to be passed for qmlcontext addresses
Change-Id: I327f40f872a2399befdbccf78e5b364ecaf86aee
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-15 06:38:01 +00:00
Orgad Shaneh
ec3695be89 Dumper: Improve Token dumper
Show identifier/literal when available

Change-Id: I4fd623f802db7bce14f8887c5b3ba2fe6867f632
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-12 06:24:08 +00:00
Orgad Shaneh
5fe0682fa6 Dumper: Fix exception with Python3
Occurred when I tried to expand an object that contains 2
unnamed unions (CPlusPlus::Token)

	File "gdbbridge.py", line 1113, in putItem\n    self.putFields(value)\n'
	File "gdbbridge.py", line 1150, in putFields\n    fields.sort(key = lambda field:\n'
	'TypeError: unorderable types: str() < NoneType()\n'

Change-Id: Ica38750435ae851b52d87dc6fcc59118d3f1d8ee
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-12 04:42:59 +00:00
hjk
7c8d20ded7 Debugger: Pass request to sort struct members to {gdb,lldb}bridge.py
The request will be honored when creating the values
instead of re-sorting in the frontend.

Change-Id: I0ea13bd9b0700a4d2ae4f0b355c56ddd37557398
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-11 08:40:51 +00:00
Robert Loehning
c7b81c60c3 Fix typo in French translation
Change-Id: I1eda15d0ea1abcd2f160a11d06e8a89d72ffa1f7
Task-number: QTCREATORBUG-14561
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2015-06-10 10:39:42 +00:00
hjk
5309e217e4 Debugger: Consolidate GDB and LLDB "updateLocals" code paths
This splits the bool setToolTipExpression() operation into
a bool canHandleToolTip(), and the actual processing of
the request, which is mostly identical to the handling of
a watcher.

Handling a watcher is now mostly the same as a full Locals
update, except for the 'partial' flag. Pushing the handling
of that down to the bridges gives identical code paths
in the gdb and lldbengine. Move that to the
DebuggerEngine base class.

Change-Id: I3861b43e8630c7e7bd57fcd549b2a2387e3d4869
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-10 07:40:27 +00:00
Orgad Shaneh
7d257acb4b GenericHighlighter: Update built-in definitions
Change-Id: I198af839da35f4057fbfda6226f1314127e59e48
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-10 07:20:36 +00:00
Tobias Hunger
ae477c3a4b qml2puppet: s/Q_DECL_OVERRIDE/override/g
Change-Id: I4c582486572df9d94c53163321212b15dcc042cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-08 10:51:24 +00:00
Eike Ziller
19f63a5d8a Merge remote-tracking branch 'origin/3.4' 2015-06-03 08:39:25 +02:00
Tobias Hunger
828b0de5db C++ class wizard: Do not add Q_OBJECT macro for non-QObjects
Task-number: QTCREATORBUG-14515
Change-Id: I02e423acc53ae23169399bc9b86b4753cb84f7a2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:20 +00:00
Tobias Hunger
bcc3cc992b JsonWizard: Make description on projects page default to the wizard description
Change-Id: Icb8a4856dda4298b3ee901bc7a5c22190ddca5a6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:02 +00:00
Tobias Hunger
f68704f8fd JsonWizard: Make checkbox default values true and false
That is closer to what a user expects than the "0" and "1" used
before.

Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:54 +00:00
Tobias Hunger
f76b9b549c Move plain C application wizards into one Json Wizard
Change-Id: If01fe6722c76df83015afa68b18d62ff1eaf523f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:44 +00:00
Tobias Hunger
f1f2475d3e JsonWizard: split plugins and features when considering enabled state
Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.

Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:50:24 +00:00
Tobias Hunger
d7b70000ac JsonWizards: Move .gitignore template file
Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 14:11:35 +00:00
Venugopal Shivashankar
ed3c8f1f76 Escaped a special character in the XML file
Without it, Qt creator complains that the XML file is invalid and
it could not be parsed. Made a language edit as well based on the
sanity bot's recommendation.

Change-Id: I04acd60d9ee4f5f29f443fa56beed6ecfbdbef64
Task-number: QTBUG-41996
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-27 13:25:01 +00:00
Jack Andersen
39df03aba7 Debugger: LLDB strictly requires bool values for breakpoint API
Change-Id: Ia4b3cfb2ef41df8c76800eb4da597f7cb5f770c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-27 09:04:50 +00:00
Eike Ziller
3858c33d74 Merge remote-tracking branch 'origin/3.4'
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
2015-05-26 15:12:42 +02:00
Tobias Hunger
b5e3f2e57b CustomWizard: Remove example wizards
We do not want to encourage the use of custom wizards, so
remove the examples. The Json wizard has already enough
real-world examples IMHO.

Change-Id: Ic755e01ce0430b90ad4d5ea3496c11ce162249bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-26 11:24:56 +00:00
Tobias Hunger
9c1f96d47a IWizardFactory: Remove class wizard kind
Map existing class wizards to file wizards. The separation has never
been clean anyway. Now "file" wizards create one or more files,
"project" wizards create a complete project (something that can be
opened as a project in Qt Creator).

Change-Id: I0562f26019b54a59d46814a13a0b2fa8995c3e0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 10:17:30 +00:00
Tobias Hunger
34008650df Wizards: Make sure wizard ids are unique
Replace existing wizards with new ones of the same id.

Change-Id: Ia17e6a4df5e7c8b647eccbe3bfb13e1c5b2d09e0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-22 15:54:11 +00:00
Orgad Shaneh
a3711ee207 Fix themes
Incomplete rename done

Change-Id: Ia792d15c3e0242f3e17479ff7bfbd9e7efa3a5ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-22 05:55:38 +00:00
Thomas Hartmann
fa6d623dfa QmlPuppet: Remove dependency on ObjectNodeInstance in MetaInfo
MetaInfo cannot depend on ObjectNodeInstance.
I forward the QObject and the QmlEngine all the way through.
The commented code in metainfo.cpp is about defining a context
for the root item. The feature is basically unused, but we can bring
it back using a callback later.

Change-Id: I8f099b06c848e2faeaafc011ac6bd313192a64bd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:17:38 +00:00
Thomas Hartmann
c9eb75e2f8 QmlPuppet: Register callback for notifyPropertyChange
MetaObject cannot have a dependency on ObjectNodeInstance.
Instead we register a callback.

Change-Id: I9f6e096c67caf1abd525201c9bacd363d31a2fa2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:48 +00:00
Thomas Hartmann
0321f6e1a7 QmlPuppet: Clean up private API usage in ServerNodeInstance
Change-Id: Ic0890c8c6740ad2c4567b58ec9b51933d0293fc1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:40 +00:00
Thomas Hartmann
4a0a1a2b75 QmlPuppet: Clean up private API usage in QmlPropertyChangesNodeInstance
Change-Id: I007bd0a8bf5be42f0f6e9ce193a35fa8a3d3f1aa
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:33 +00:00
Thomas Hartmann
c6a2f1fe46 QmlPuppet: Explicitly include private headers
Those headers are used implcitly.

Change-Id: I49dcfb1a04b2103866b1d828605381570fb3e5c6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:23 +00:00
David Schulz
ab2a0d74de TextEditor: Sort text marks in categories.
Also adding a color for each category.

Change-Id: I3627d13913951a95804b5a816f087a822c01bd86
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 08:23:16 +00:00
Thomas Hartmann
4763acbd95 QmlPuppet: Clean up private API usage in QmlStateNodeInstance
Change-Id: If1c8cee81cbdd6f90808a824c2b4d023dd8a3e12
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:35 +00:00
Thomas Hartmann
c919795a08 QmlPuppet: Bring back simplified NodeInstanceSignalSpy
A simplified version of NodeInstanceSignalSpy is required to track
sub objects. I moved all private API usage to QmlPrivateGate.

Change-Id: I86e3e5411eb43777a6b1ab5018a1b8fb9088c666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:25 +00:00
Thomas Hartmann
a577600d12 QmlPuppet: Remove unused code
Change-Id: I1d6e136748ea8242ff0149f4612a32d71394999f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:53 +00:00
Thomas Hartmann
7415ea9563 QmlPuppet: Remove unused private header
Change-Id: I699c423c3d4a84659e074e310e8697cd19f5c4c0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:48 +00:00
Thomas Hartmann
afd903c4a4 QmlPuppet: Remove private dependencies from NodeInstanceServer
Change-Id: I386bd18704020d0b174cda224c4cf46245227877
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:43 +00:00
Thomas Hartmann
6fe2c1455c QmlPuppet: Remove private dependencies from PositionerNodeInstance
Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:30 +00:00