Commit Graph

36364 Commits

Author SHA1 Message Date
David Schulz 6e9b724006 Editor: Blockselection rewrite.
Also adding the possibility to insert text into the blockselection.

Task-number: QTCREATORBUG-7773
Change-Id: I7a47a1d630f769a8253ee1a2f21057820ea170d5
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-20 13:16:54 +02:00
Tobias Hunger ce324b8d28 Qbs: Factor parsing code out of QbsProject
Change-Id: I9b86baf964252e3d155cce533c79ca7a9dc9b315
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-06-20 13:02:33 +02:00
Thomas Epting a8304f3b42 QbsProjectManager: Provide functionality to add files to a Qbs project.
Started implementing common functions to add new and existing files to
a project, using the API provided by Qbs. Works for most use cases
already. However, this is still work in progress.

Change-Id: I36ea921c203bd7caad564a45cd40cda408c72b54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-20 13:01:38 +02:00
El Mehdi Fekari 92e8009053 Qnx: Generate bar descriptor when opening new projects
When opening a project the first time with Qt Creator
and selecting a BlackBerry kit, Qt Creator does not pop up
the dialog asking the user to add a bar descriptor. This
makes the deployment step useless since the bar descriptor
is mandatory for packaging.

The user has to close and reopen the project again in order
to be able to generate a bar-descriptor.

Change-Id: Ibb930e60d3b9d98ad9631caa092f6ec17b33b749
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-20 11:27:49 +02:00
Tobias Hunger 0cb50a9b30 VCS: Store QRegExp instead of recreating it on every cursor move
Change-Id: Id2eec876d84acb783e850d184a194b4d6a963259
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-20 11:11:17 +02:00
Tim Sander 3828c94b39 GdbDebugger: add fast restart for debugging
Change-Id: Ie51847de912748d05a6b208bec82fd612d777202
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-20 10:57:03 +02:00
Tim Jenssen 5df2389970 QmlDesigner: rewrite itemlibrary
Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:47 +02:00
Tim Jenssen 2e06f98a3b QmlDesigner: convert itemIds to real entries
Change-Id: I421d20a33f8f30fe796f72e4500a2756b97c7983
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:41 +02:00
Tim Jenssen 1da0d018c2 QmlDesigner: prepare Sections for use as a delegate
Change-Id: Ieeddea3d813f13cb7018d6611156f1f98b69e6be
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:29 +02:00
Tim Jenssen 30780640ad QmlDesigner: remove ugly pixel line from scrollbar
Change-Id: Ib553128667a85abadfe9b810860b0f7a68499bed
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:06:57 +02:00
Thomas Hartmann 80e2f51183 QmlDesigner: Rename DefaultDesignerAction to AbstractAction
We are already in the QmlDesigner namespace and default gives
no real information about the class.

Change-Id: Ia45c93c778d207c5237d52f5bd2bef6ee6559bb5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 16:37:34 +02:00
Thomas Hartmann 9d43e11bdb QmlDesigner: Rename AbstractDesignerAction to ActionInterface
We are already in the QmlDesigner namespace and the class is
a pure abstract interface.

Change-Id: Ibabea5f8091fda22a3086ae032af794bc12ebf38
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 16:37:28 +02:00
Marco Bubke f36a1b48c1 QmlDesigner: Add ModelNode::isSubclassOf
Change-Id: Icd1b0fcb19a0e15279b68059efa6aa251ce806a0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:44:33 +02:00
Marco Bubke f9389d62fd QmlDesigner: Use auto for STL style iterators
Change-Id: I64ed8842587266b44a0cc377b3ac50d40b3633a7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:43:47 +02:00
Marco Bubke e51047992a QmkDesigner: Refactor ItemLibraryItem
Change-Id: I0876f3b94df6ea0cf457e67306c89a798f0c8bfd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:43:37 +02:00
Marco Bubke 9c8fa496f6 QmlDesigner: Make ItemLibraryEntry known to qml
Change-Id: I1201739e099425bcac3a5b209ca1bdf3573c3223
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:38:00 +02:00
Marco Bubke 878abe61e7 QmlDesigner: Add ItemLibraryEntry to ItemLibraryItem
Change-Id: I896e54fada0368fb548b39b9aff9cd19953c8ab3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:35:57 +02:00
Marco Bubke 0f61929caa QmlDesigner: Use auto for iterators in the item library
Change-Id: Ib6664b1a0609d3f882d8a50f114504ef48e30510
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-19 15:35:40 +02:00
Thomas Hartmann 72906cc776 QmlDesigner.ComponentCore: Making members private
Change-Id: I5674499c66acf6bb86abd0f56c318ceff021e1bb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 15:32:54 +02:00
Thomas Hartmann 30b206a53b QmlDesigner.TabViewSupport: Add proper setter
Change-Id: Icc081ca3df73b565eae1aa062a86e3560f0b3793
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 15:30:35 +02:00
Thomas Hartmann c94d86e80a QmlDesigner.ComponentCore: Refactor and export AbstractActionGroup
The classes in modelnodecontextmenu_helper.h are used to create a
huge bunch of AbstractDesignerAction objects in a prototype based way
using function pointers.

This patch adds AbstractActionGroup which makes adding
sub menus easier, but does not use function pointers.

Change-Id: I5674493c16acf6fb86abd0f56c318ceff021e1b5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 15:29:10 +02:00
Friedemann Kleint ded93b43d2 Gerrit: Read out dependency information.
Pass on the command line argument --dependencies to the client,
read out dependent/needed by changes and display them in the
detailed text view. Move the toHtml() method from GerritChange to
GerritModel to be able to display titles of dependent changes.

Change-Id: I1d0b67a995d45a9fe5b7bdb3ff51cc905d58478f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-06-19 15:11:24 +02:00
Tim Jenssen 3f25ed3bbf make it compile with none gcc compilers
Change-Id: Ib8a49014ecb86db79517d34338b0b9db43bef1fd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-19 15:09:46 +02:00
hjk 48b12fe921 Valgrind: Compile fix for Windows
Change-Id: Id60005f4760746299827fb502f1c0afec71542df
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-06-19 14:23:22 +02:00
hjk 9968271d3f Debugger: Streamline gdb.Value field access workarounds
Change-Id: I1b3b81019f6861353e5ada350fadbe3c8734f186
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:14:16 +02:00
hjk e744649456 Debugger: Add VariableSupport to some text fields
Change-Id: Iba1e7d2eeb49600a9952c369f66187384aa8cbf2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:12:34 +02:00
Daniel Teske 7d45a1a1c5 IBuildConfigurationFactory: Partial revert of 5a30007e45
The find methods should not return a factory with a -1 priority.

Change-Id: I05dab0c48b24b30f88cf40f49c2bc0e24bff46ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-19 14:11:50 +02:00
Tobias Hunger 110293d4e0 Project: Do not save unconfigured projects
This avoids having .user files when pressing cancel on the Project Mode's
TargetSetupPage.

Change-Id: I09fc8e78c929d6f09a50ee57ef4f59555491c649
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-19 14:09:56 +02:00
Rainer Keller 53969701f6 Show Qt Quick templates only when needed plugins are available
A Qt Quick template should only be visible if its required plugins are
available.

Change-Id: I932563cb9ffd2a2eca0e77e9945638573d07ba3e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-06-19 14:00:58 +02:00
Nikita Baryshnikov 12103e0f67 Reinvent deprecated qSort as Utils::sort
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:00:32 +02:00
hjk eefd0f4332 Debugger: Remove unused variable in autotests
GDB 7.7 changed behavior e.g. for the names of anonymous fields,
we need to adjust dumpers and some tests.

Change-Id: I25ae32cc56c4ff63b677a04d6ed9c250e0252140
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 13:46:46 +02:00
Thomas Hartmann 9ccd45c5de QmlDesigner.MetaInfo: Adding isTabView()
Change-Id: I05fee773ed83a99fb14b495de3ace0bc87692fe9
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 13:45:39 +02:00
Robert Loehning 4b772f6a3f Mercurial: Assign parent to dialogs
Change-Id: I8c875b86610a9a647821cca563ff4c1a0c11cbaa
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-19 11:44:02 +02:00
David Schulz 0d11c79418 Editor: Fix "Clean Whitespace" action.
Task-number: QTCREATORBUG-12451
Change-Id: I2e9c97d0aa9081268377b002698f7659fc39cdce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-19 09:14:52 +02:00
hjk e213bc5c84 Generic Highlighter: Remove progress output
It's not too helpful and a long display name causing all the
other progress bars to adjust and look rather intrusive.

Change-Id: Ib90904368a621728b31125d1a997c3739f7341d5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 22:34:48 +02:00
Marco Bubke 169ba1f95e QmlDesigner: Increase timeout for puppet creation
Change-Id: I41916561c0939fa163b28ba802382e6ccfcc55b6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 18:08:47 +02:00
Nikolai Kosjar f55cac32b1 C++: Remove initialization of enum variable in DesignatorAST
The tool 'cplusplus-update-frontend' can't handle that and thus will
rewrite that class without this initialization.

The member is properly initialized at use.

Change-Id: I2c8c57be47b5fe953c2518254656e5e38ba90f08
Reviewed-by: Wang Hoi <wanghoi@126.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-18 17:19:33 +02:00
Leena Miettinen 78532ef516 Doc: Regenerate Index button
Remove the workaround from the docs now that we
have the button. Update screenshot.

Change-Id: Ib9e209fa7526749aa0f54e554a6b11e86d53f665
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 17:18:37 +02:00
Daniel Teske 4efd793976 QtVersionsDialog: Add missing spacing
Change-Id: I73384f4cb7f1daca812a1b5f662a875810ff4d40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 17:01:47 +02:00
Tim Jenssen 115620aabc QmlDesigner: cleanup unused methods
- remove javascript methods: scrollView(delta), resetView()
 - remove javascript related signals
 - remove visibleCount debug output

Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:51 +02:00
Tim Jenssen a850dc2033 QmlDesigner: move ScrollViewStyle to common directory
Change-Id: Ieb235aab921bd5d246403ff42b4659090c8abdbf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:34 +02:00
Thomas Hartmann 95bcd0883f QmlDesigner.PropertyEditor: Fix TextEditSpecifics
I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".

Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.

Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 16:41:34 +02:00
Ulf Hermann 672e7042cb libUtils likes capital 'U' to be linked correctly
Change-Id: I9b32e720ab31c369edc16e5fdcd956d22f6f7eac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:08:25 +02:00
Christian Stenger 21983e080d Help: Fix Qt4 compile
Change-Id: Ic9027415d427f65c7012399ff4877a2a444814d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 16:06:49 +02:00
Robert Loehning 3c7f5c08bd Bazaar: Assign parent to dialogs
Change-Id: I3bbcd289c06932b2031d08e13e5378010acd58a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2014-06-18 15:40:46 +02:00
Marco Bubke 59e4bc9112 QmlDesigner: Add PuppetAlive command
The puppet can be dead but we don't now. Now the puppet is sending a alive
signal. If the signal is not arriving anymore we restart the puppets.

Task-number: QTCREATORBUG-12434
Change-Id: I90edab6a45f95950fd764adcb125068659d5354b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 15:00:12 +02:00
Ulf Hermann e9edc3ad3d QmlProfiler: Don't use initializer lists, yet
Change-Id: I27a636036b3f7d613079245432858e0ba690ab77
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 14:33:54 +02:00
Tim Jenssen 1121cac755 compile fix for msvc2010
Change-Id: Ifdcf16d12af06c7f3da6feb133e139ffa0acdb11
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-18 14:31:01 +02:00
Eike Ziller 514087487d Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-06-18 14:25:03 +02:00
Thomas Hartmann f77a7571e8 QmlDesigner: Move TabViewDesignerAction to componentsplugin
Change-Id: Ib02092d38d4ba43ad3bed2460f7eb9615bd06fa7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-18 14:23:51 +02:00