Commit Graph

31174 Commits

Author SHA1 Message Date
Przemyslaw Gorszkowski
7e7fb2244a AutoTests: fix test framework in case of tests for class members
Change-Id: I564ea9cccc24509957481b6726f25833f35a4da4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-14 12:15:04 +02:00
Nikolai Kosjar
b143f4a3ac CppEditor: Mark a test case as expected to fail.
Contributor works on a fix.

Change-Id: I998558b53b6506bcb1398cd2cd783b748b358240
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-14 11:38:11 +02:00
Nikolai Kosjar
c983053c9c CppTools: Fix signal redefinition
...leading to the error message

QMetaObject::indexOfSignal: signal aboutToRemoveFiles(QStringList) from
CppTools::CppModelManagerInterface redefined in
CppTools::Internal::CppModelManager

Change-Id: I0a1c307ad5fc0d7cefa198726f534140192facad
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-14 08:26:06 +02:00
Orgad Shaneh
c73a9a63f2 Fix compilation with Qt4
Change-Id: Icad8723e26f7f9d89098e04c09c9dbd2d5539902
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-14 07:54:30 +02:00
Oswald Buddenhagen
b64b4431c2 avoid deadlock in cache() during spec/cache loading
if we end up calling cache() from within the initialization of the base
context, we cannot wait for for the completion of that initialization
before we proceed, obviously.

Change-Id: If30c6f3665fe423e767373a8821c406b2f5e0eca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-13 16:33:00 +02:00
hluk
6c3972680e FakeVim: Operator-pending mappings
Implements :omap (and :onoremap) for defining user mappings for movement
while in operator-pending mode (after commands 'c', 'd', '>' and
others).

Change-Id: I07a1e90bf5c649ef5bb53d1de873817dc7348e19
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 15:45:16 +02:00
hjk
16c4c2ae64 Debugger: Improve caching of unnamed structures
Task-number: QTCREATORBUG-9947
Change-Id: I701bb87ecafc4c1260003de51678ab66122aaffa
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 15:42:14 +02:00
hjk
742c1a714d ISettingsAspect: consolidate data copying in base implementation
Change-Id: I1eec0f54d05b3f7d8679060faccc14ec8a3777f6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-13 14:17:02 +02:00
Nikolai Kosjar
8ea14767af CppTools: Rework handling of ProjectInfo changes
(a) The code model manager figures out by itself which files were added
    or removed from the project.

    If this was done successfully, check also the timestamp of the
    common files and reindex if necessary.

(b) A full reindexing is only triggered if the project configuration
    changes (defines, includes, framework paths).

(c) If project files were removed, the garbage collector is called.

Task-number: QTCREATORBUG-9730
Change-Id: Ib855614b070880576233a3525813617c967a72f3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-08-13 14:13:33 +02:00
David Schulz
74a94e656e CPPEditor: Fix cppquickfix_test compile
Change-Id: Ibf91733e08b818dffd16dd9fc171efec5a4488b0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-13 14:10:49 +02:00
hjk
3c14ceebad Analyzer: Rename AbstractAnalyzerSubConfig to ISettingsAspect
More in line with IRunConfigurationAspect

Change-Id: I50a038de004733b6b19d345b30a63cc2db02875a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 14:01:17 +02:00
hjk
cd460a3638 RunConfigurationAspect: Streamline data serialization
Change-Id: I6f49dd9eeff53eafc51bd5238ca655437df12111
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 13:18:42 +02:00
Marco Bubke
e3ae9e80b5 QmlDesigner: Add ImportManagerView
It does nothing but this time I don't want push a big source ball.

Change-Id: I3ab547bc2780391508333673dc9715fd0be61c67
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-13 12:55:57 +02:00
hjk
6e827fcded Analyzer: Remove now unneeded AnalyzerManager::m_tools member
Change-Id: If084739b81ab7486d667eabb665a272bc9020d2e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-13 12:36:09 +02:00
Robert Loehning
af8a95d1fc Squish: Added test for external sort tool
Change-Id: Iacc1be6b3c1c16628948a744338eaae82c566015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-13 11:58:14 +02:00
Daniel Teske
ac94ae8112 Qt4Project: Handle special cases for renaming files
Task-number: QTCREATORBUG-9824
Change-Id: I1a237a57332c929844fdc230c96fba397d79d312
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 11:54:55 +02:00
Tobias Hunger
abc4d5f9e2 Autotools: Add method to retrieve default build dir based on project file
Change-Id: Ifd5af5c69329d2b9c86da8c8df796f317c65e1ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 10:40:26 +02:00
hluk
9c5ae766a2 FakeVim: Fix scrolling on small movement
Fixes scrolling to center text cursor on screen on j/k and h/l on last
visible line.

Change-Id: I65a1144a99f44a3df4217bc8eb6ee5ae6ef89ad4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 09:51:22 +02:00
David Kaspar
e6641ac5d4 Qnx: Fix for Upload Debug Token action in BlackBerry Device Configuration
Task-number: QTCREATORBUG-9975
Change-Id: I937f6d99730f4802ef9b1cf2b91145762cd4934e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-13 09:33:45 +02:00
Orgad Shaneh
5f353cc41c Fix compilation
Broken by 269d51935d

Change-Id: I5f86fc8049955a3e01a013c5f7845d3a9b6f0f83
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 09:32:34 +02:00
Leena Miettinen
2f6e5cf59c Doc: attaching to running app while debugging
Change-Id: I3566c77bfb8466005db12fd4a77c861a07f69019
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-08-13 09:27:21 +02:00
Christian Stenger
a932c6ebca Squish: Improve invokeMenuItem()
Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-13 09:23:34 +02:00
Nikolai Kosjar
f23fed601b CppTools: Tests: Move test includes utils into helper class
Change-Id: Ia679f3d2ae5fce0978a4e320fa18b28f1a7bed71
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-13 09:23:02 +02:00
Orgad Shaneh
3be6065b04 Git: Fix crash on quit while rebase-todo editor is open
Change-Id: I458cbb2168642f226583b406e34596d223c7d5ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 09:22:20 +02:00
Orgad Shaneh
15a9019191 CustomToolChain: emit dirty() on changes
Change-Id: I0c9a199562ff6b5953d22d42b28f814e53ffb3d9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-13 09:18:32 +02:00
Nikolai Kosjar
deb4fbe768 Compile fix in QmlDesigner
itemlibrarywidget.cpp:53:42: fatal error:
private/qdeclarativeengine_p.h: No such file or directory

Change-Id: I55109fdecd33203199f73017ae06da88c892ff4d
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-13 09:09:50 +02:00
Orgad Shaneh
b6ef8f3718 VCS: Use text settings for description textbox in submit editor
When using dark color scheme, highlighting with white background is
unreadable.

Change-Id: I8c65d8c9fc08448f1c04680ed7a1d4c0fd842070
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-13 08:48:43 +02:00
Orgad Shaneh
ec266325fa CodePaster: Disable undo/redo buffer
Task-number: QTCREATORBUG-7645
Change-Id: I51b0301b5bc376f45deb5925bda8db936973aaef
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 18:59:54 +02:00
Thomas Hartmann
bba547d1f2 QmlDesigner.PropertyEditor: crash fix
This crashed when the template definitions were missing.

Change-Id: I22aff1b9bb809ff59f108cb90f47b19c2db223fa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:26:19 +02:00
Thomas Hartmann
8ffdcc60a6 QmlDesigner.PropertyEditorView: using getter
Change-Id: Ib7a900af164dd1ab35c9b9d472b292900269d9c4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:25:48 +02:00
Thomas Hartmann
99cdad7a47 QmlDesigner.ItemLibrary: remove depedency on private Qt
Change-Id: I370cc96d6d939f45962add9bd5280ae3a9b51214
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:25:31 +02:00
Thomas Hartmann
827025c07b QmlDesigner.PropertyEditorView: use forward declaration
This reduced dependecies.

Change-Id: I064a9f4ef953196a301b4fdd194db2370efcfba1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:25:24 +02:00
Thomas Hartmann
0c0c3faa12 QmlDesigner: renaming constant
DELETE is provoking a name clash even in the namespace.

Change-Id: I5aeb99b527db5308808a3fc077a6710d5a20cdfb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:24:21 +02:00
Thomas Hartmann
a1276ab0eb QmlDesigner: adding missing include
Change-Id: I0a8d05104809cf4d1b5b806ee4e6d1675eac760c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:23:02 +02:00
Thomas Hartmann
dc84fbb24d QmlDesigner.PropertEditorView: remove unused code
Change-Id: I32bf8c4f09ddaa0ac82decf9458e429ead23780c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:21:58 +02:00
Thomas Hartmann
fd4e68ac7e QmlDesigner.ItemLibrary: remove declarative private dependecy
We derived from QDeclarativeListModel which is private.
This patch uses QAbstractListModel instead.

Change-Id: Ib567433f5fbb38780b32e5a9291d2cb87730e624
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:21:27 +02:00
Thomas Hartmann
9385c9f9e8 QmlDesigner.PropertyEditorView: moving code in extra function
Adding setupQmlBackend()

Change-Id: Ie7446ad8ef8153f3ff70a2f22466ac3ed24e3f92
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:20:52 +02:00
Thomas Hartmann
2b0f93c8d8 QmlDesigner.PropertyEditorView: further cleanup
Cleaning up/renaming the functions used to resolve .qml files.

Change-Id: I80ccb9346d89c0841ad0109147d8a9e07cf20408
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:20:22 +02:00
Thomas Hartmann
00eccf6b22 QmlDesigner.PropertyEditorView: moving QML types registration
Moving the registration of QML types from PropertyEditorView
to QuickPropertyEditorView.

The view itself should not handle QML implementation details anymore.

Change-Id: Ia66db999e2f7a4b8cbe1111c4176257344d78ea8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:20:12 +02:00
Thomas Hartmann
7a5cce92c2 QmlDesigner.PropertyEditorView: move code to QmlBackEnd
Moving QML related code from PropertyEditorView to
PropertyEditorQmlBackend.

PropertyEditorView should not contain any code related to QML anymore.

Change-Id: Ia58db399e2f7a4b8cbe1119c4176257344d78ea9
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:17:37 +02:00
Thomas Hartmann
a01f70c089 QmlDesigner.PropertyEditorView: moving template generation
Moving template generation from PropertyEditorView to
PropertyEditorQmlBackend.

Change-Id: I8c7d2c46863544b98b203cc690bd15f4f4653f09
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:17:19 +02:00
Thomas Hartmann
eeb0dc2d03 QmlDesigner: signal was renamed
Change-Id: Iddb2066372cdb9f1b80b8ab53ab88c69273634c1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:08:27 +02:00
Thomas Hartmann
3353b0f253 QmlDesigner: refactoring PropertyEditor
* Renaming PropertyEditor to PropertyEditorView
* Adding PropertyEditorWidget
* Renaming DeclarativeWidgetView to QuickPropertyEditorView
* Renaming NodeType to PropertyEditorQmlBackend
* Moving PropertyEditorQmlBackend into separate file
* Cleaning up interface of PropertyEditorQmlBackend

Change-Id: I1291feb5880b01d1e2bac09f4eb1e0181ff04d5c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:01:31 +02:00
Thomas Hartmann
13033734a1 QmlDesigner: Fix crumble bar for infile components
CrumbleBarInfo contains the ModelNode to properly identify the node.
We cannot use the id, because no every component has an id.

If the crumble bar only contains one item it is hidden.

Change-Id: I4d421eaad8962aa9043567e1f27957b1aa089766
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 17:51:26 +02:00
Thomas Hartmann
5a6008d2f5 QmlDesigner: removing unused include
Change-Id: I52f77a2bb5eb52956d08596478aecab383033900
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 17:36:39 +02:00
Marco Bubke
7f66d8fe03 QmlDesigner: Raise exception for a invalid parent property
Change-Id: I0272b0aefc0598ad524aa1d9e6b434ef2dcd79a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-12 16:19:11 +02:00
hjk
d3c299cbe3 ProjectExplorer: Streamline ToolchainFactory interface
Change-Id: I70dba496c4d1eeb9c6767080d179f86f20c1b107
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 16:14:06 +02:00
hjk
bf6685bc5d Valgrind: Remove unused ValgrindBaseSettings::displayName
Change-Id: Id1f03290b428a9ef6450df6f428cf8fd493c7453
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 16:13:55 +02:00
Daniel Teske
c20da77b27 HostOsInfo: compile, #define _WIN32_WINNT for GetNativeSystemInfo
Change-Id: I012afcdb53b6a081eabfb0843236a25dd27d6ddb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-12 16:03:56 +02:00
David Kaspar
269d51935d Qnx: Add BlackBerry Device wizard queries device to prefill wizard fields
BlackBerry Device wizard is having the following pages:
* Setup page - simplified to contains the device listing,
device host name and device password fields only
* Query page - queries device for information
* SshKey page - no changes there
* Config page - contains config-name and debug token fields

Change-Id: I30e05b984960df2184353209bff1f07c9440e6b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-12 15:49:14 +02:00