Commit Graph

32241 Commits

Author SHA1 Message Date
Thomas Hartmann d510167e4a QmlDesigner.PropertyEditor: adding functionality to LineEdit
* Adding the ExtendedFunctionButton
* Adding blue highlight for modified values

Change-Id: I44f7d3bfbf58f0fe60321b5c696d3e3ba9c6578f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 10:16:55 +02:00
Thomas Hartmann 4a8a33179a QmlDesigner.PropertyEditor: adding functionality to ComboBox
* Adding the ExtendedFunctionButton
* Adding blue highlight for modified values

Change-Id: I2035ebba61b27ec5c75f02abc3a435709cc69f43
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 10:16:46 +02:00
Thomas Hartmann d60f87d925 QmlDesigner.PropertyEditor: adding color constants
Change-Id: Iced7b432da397485015a4ea4a3e742f0ab475b6a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 10:16:37 +02:00
David Schulz d597d79515 CdbExt: version bump
Change-Id: I3912bb9da93acd4474a15a6f6a8736e547e84ea1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-23 09:55:22 +02:00
David Schulz 03dbb665b7 Fix build on windows in debuggerkitinformation.
Change-Id: I45137f08147d073f8c111c94a6303a90085183ef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-23 09:39:13 +02:00
Friedemann Kleint 719c87e599 Remove setting of Qt::AA_DontCreateNativeWidgetSiblings .
Change qtbase 72a7882cec07a9ad187c9e1772fb08f59a4b9519
avoids unnecessary creation of native siblings in Qt 5.

Task-number: QTBUG-34138
Change-Id: Ie6b847f57a40d56028c771628f31acb182179066
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-10-23 08:10:19 +02:00
Fawzi Mohamed eed81ea871 qmljs: simple tracking of used modules
Change-Id: Idc977a8c5a6c6caa3749599cb6f4a236046f53d7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-23 00:35:52 +02:00
Fawzi Mohamed 0a4310d314 qmljs: added qmljsconstants.h
Moved Document::Language, Import::Type and StaticAnalysis::Severity
enums to qmljsconstants.h and renamed values removing the redundant
part.
Thus the effective length changed little or improved
(Document::QmlLanguage => Language::Qml).

The separate file allows better reuse of enum values without introducing
circular dependencies.

Change-Id: I5186d7c04f5d3f6c289068b919be5ff1ff118326
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-23 00:35:16 +02:00
Petar Perisin ab71755326 Git: Fix popup message for merge
Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-22 20:42:50 +02:00
El Mehdi Fekari 36e6a70505 Debugger: Fix the way to register/add new debuggers
DebuggerItemManager::registerDebugger() should return the id
of the added debugger in order to use it when setting a kit's debugger
(addDebugger() creates and adds a copy of the passed
debugger object with a unique id).

The DebuggerKitInformation::setDebugger() method should set only already
existing and registered debuggers.

Task-number: QTCREATORBUG-10436

Change-Id: Icdcd1ed92aafe9eda44abf831aa9983dd6801980
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 20:14:14 +02:00
hjk 9f66b6384a Debugger: Fix QVariant{Map,Hash} dumper with Qt 5
Change-Id: I5be3b960a7a3091dc77555883d93e3d89b17381d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:14:33 +02:00
hjk 4c35310cec Debugger: Adjust QDateTime dumper after Qt 5.2 changes
Task-number: QTCREATORBUG-10232
Change-Id: I10551a258edb9456c4a9f93a3bfb374a8f07fc7d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:12:31 +02:00
hjk a6c060cc65 Debugger: Try to extract Qt version from QtCore
This won't work without inferior calls (e.g. when loading core files),
so the old code is needed as fallback.

Change-Id: I1c9efc06374b00bc391bf55528546ccefc60349b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:12:22 +02:00
hjk 6851f019e4 Debugger: Some autotest cosmetics
Change-Id: Ib174e84f97511b28cd7649c219a62fe606186bf2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:11:30 +02:00
hjk 4497d136ce Debugger: Leave GDB default setting for 'set overload resolution'
... and work around the pecularities on the dumper side instead.

Change-Id: I0c2703aae13dabc0f3f45efb46bd556c8741a15f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:11:02 +02:00
hjk 363c9c87b2 Debugger: Work around strange GDB behavior with overload resolution
Contrary to the documention, using the default (i.e. 'on') it seems to _require_
xplicit casting of function pointers:
 (gdb) p &Myns::QMetaType::typeName
    -> $1 = (const char *(*)(int)) 0xb7cf73b0 <Myns::QMetaType::typeName(int)>
 (gdb) p Myns::QMetaType::typeName(1024)
     -> 31^error,msg="Couldn't find method Myns::QMetaType::typeName"
But we can work around on the dumper side. So let's use the default from now on.

Change-Id: I3e2a87df797c6abab6183b4c121b843e5035cd47
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 19:10:47 +02:00
Tobias Hunger eb944974ac Debugger: Have 64bit debuggers handle 32bit targets, too
Prefer 32bit debuggers if possible though. In the setup Robert
used there is only a 64bit CDB and thus the debugger of his
64bit Qt was unset.

Add unit tests to make sure changes will not effect currently
working setups.

Task-number: QTCREATORBUG-10463
Change-Id: I4afae314bc75d4465dbc8de5b2a4267a521a4ea1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-22 19:03:47 +02:00
Daniel Teske 04ea1898b5 Android: Search for a suitable emulator before starting a new avd
Note, that we don't know the names of the started avds, so we look
for a avd that has the same abi and apiLevel.

Task-number: QTCREATORBUG-10411
Change-Id: I5f6ff3ee0dddcf2bb8fca981ccedf437e32da677
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-22 17:48:38 +02:00
hjk 3e789de36d Debugger: Fix Qt 5 QHostAddress autotest
Dumper was working, but the default constructor doesn't do
the parsing already nowadays.

Change-Id: I098b0a03ad7d994b5746f3a4a6c39d29133509b0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 17:18:18 +02:00
hjk e643f3bf74 Debugger: Avoid Gui dependency of dumper autotest
Change-Id: Ie51554216ad7b132839c2779c2f647ad6222db5f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-22 17:13:16 +02:00
Thomas Hartmann cde0a8828d QmlDesigner.PropertyEditor: fix combobox for anchor targets
Change-Id: Ib66e19ad2d70cb8c5fd295288a625af06104d40e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:05:12 +02:00
Thomas Hartmann 92baa15ed0 QmlDesigner.PropertyEditor: fixing combo box for font
Change-Id: If1a72549568bfddac3e02151ff9a13be4b578e40
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:02:16 +02:00
Thomas Hartmann 4c42a8ee95 QmlDesigner.PropertyEditor: fix for CheckBox
Change-Id: I8ca2642b50c8f1b529db77ffb4e91f34a0a3b2bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:02:06 +02:00
Thomas Hartmann 50c9661ca3 QmlDesigner.PropertyEditor: fix for ComboBox
Change-Id: I766cdf7831509fa7d4e6c6b98f304b814f2f4e76
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:01:58 +02:00
Thomas Hartmann 2f64fecd45 QmlDesigner.PropertyEditor: fix warnings about missing NOTIFIER
Change-Id: I7386bead0b1f8d4c577c318dae5873491885901b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 17:01:47 +02:00
Daniel Teske ac627bb770 CMake: Don't expect the version in --help output
Since we don't actually need it anymore, just remove the code.

Task-number: QTCREATORBUG-10452
Change-Id: I59f55f3a319240826569de308491cac697c4f045
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-22 16:40:07 +02:00
Friedemann Kleint 3716791d0b Library wizard: Don't use base class unless it is a plugin.
Task-number: QTCREATORBUG-10444
Change-Id: Iae6559e27573dcdfdde70292f637eb820bf99c93
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-22 16:31:33 +02:00
hjk 5e9f67bf48 Debugger: Make namedemangler test run without X
Change-Id: Ia04d6b7999eaa2de6471031100fa4143549185d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 16:12:00 +02:00
Nikolai Kosjar e79d4ed2e1 CppEditor: Follow Symbol Under Cursor opens the preprocessor dialog
... when invoked on a macro that is defined inside that dialog.

Change-Id: I419c6675d70cfb8dd174f6a33f502b4c584baa3a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-22 15:58:54 +02:00
David Schulz f5fa022de5 CppEditor: Adjust Title in preprocessor dialog.
Now its more consistent with the other text in this dialog.

Change-Id: I424428a6fb892a2f0be2a3c6b11ae652ea39c679
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
v3.0.0-beta
2013-10-22 14:52:02 +02:00
Leena Miettinen f1750ba4f7 Doc: new filters in the Issues output pane
The Debug Information, Debugger Runtime, and Deployment
filters were added.

Change-Id: Ifc22e1dfb1d1a9b0b72e371bfa7963c646d3ff2f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 14:02:47 +02:00
Leena Miettinen 668849cad6 Doc: replace Qt GUI Application with Qt Widgets Application
Qt GUI application could also be a Qt Quick application.
Update screenshots.

Task-number: QTCREATORBUG-10263

Change-Id: I8c0dd34e1222c3b42fddaf3f562e402490ce1037
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 13:50:50 +02:00
Leena Miettinen 964d42850d Doc: the Welcome screen was updated
Task-number: QTCREATORBUG-10446

Change-Id: I1bfda7119ebd541d4dbfa1b7a65c3155221b3c6d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-10-22 13:41:40 +02:00
Tobias Hunger ceba333683 RunSettings: Do not needlessly recreate RunConfiguartionConfigWidgets
Change-Id: I0b8afe05b12123117959eec6f7465ebd4950e197
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 13:28:14 +02:00
Tobias Hunger 9dd656914a Qbs: Fix memory leak in Qbs Project Manager
Make sure the root node of the project tree is actually deleted.

Change-Id: Idf32460d7b5d0518da9536084cccb074638cfce3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-22 13:26:50 +02:00
Eike Ziller 5686f5fd70 QUrl dumper: use correct string type name and extend test
Change-Id: I7fe88d11b3d52ba31d3e8564b673a35001e31488
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 13:20:03 +02:00
BogDan Vatra d8aadac323 Remove adb daemon logs
If adb daemon is not started, adb devices command will add two lines to
the output, messing up the devices list.

Change-Id: I40dcf586d2661df2de0a56aaac543c3b4739ab0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 13:05:08 +02:00
hjk bdf8655376 Debugger: Make LLDB auto test start again
Change-Id: I11358adc8c01dd1261627f35d0f35500e8b34989
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 12:46:25 +02:00
Eike Ziller 1eb88443d7 Merge remote-tracking branch 'origin/2.8' into 3.0 2013-10-22 11:38:21 +02:00
Eike Ziller 16c2ee1b99 Merge origin/2.8 into 3.0
Conflicts:
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: I1028a14230b9dea0cdb68068469a96e8ddb78754
2013-10-22 11:37:14 +02:00
Eike Ziller 8f00f261aa Merge origin/2.8 into 3.0 2013-10-22 11:34:20 +02:00
Marco Bubke 52d8cd2529 QmlDesigner: Remove qml2puppet test file
Task-number: QTCREATORBUG-10449
Change-Id: Ied72268910bc2312c3d293da0ef38c1ff8b72fc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 11:14:14 +02:00
Eike Ziller 515a958083 Fix Qt5 QUrl dumper
Change-Id: I5da72aebe30a3f7030b44566561fca25ce867c0a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 10:47:21 +02:00
hjk fc52b30450 Debugger: Simplify QVariant{Hash,Map} dumper
Change-Id: I4c5c79f9b2b2d739971d9f50a2b48cfde005e167
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 10:11:17 +02:00
hjk 43ceec94f4 FakeVim: Initialize new m_inFakeVim member
Also move initialization before connection setup.

Task-number: QTCREATORBUG-10443
Change-Id: I3f3d074534a44a0aa6b8cc60c8ffbcd22d96ca33
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-22 10:01:29 +02:00
Friedemann Kleint 4ffd5403d5 QNX: Fix compilation with Qt 4.
Change-Id: I8607dd339f5c6e3580f2e17c8ca3b7bcbbb11a8e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 08:33:04 +02:00
Friedemann Kleint 50f522b2f7 Remove most trailing newlines from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 08:05:09 +02:00
David Schulz 10f42df8b3 CppEditor: Remember project in preprocessor dialog.
Change-Id: If226707541b1fd4d5c22de2795fb39bc333cfa49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-22 07:38:24 +02:00
Thomas Hartmann ffc90ba09f QmlDesigner.PropertyEditor: Adding PathViewSpecifics
Change-Id: I79192a68a0ac71970f4069a9ccc5696a56dda607
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 20:58:48 +02:00
Thomas Hartmann bbe0acb26a QmlDesigner.Model: allowing some diagnostics for exceptions
Setting QTCREATOR_QTQUICKDESIGNER_WARN_EXCEPTION will give detailed
information about any exception thrown.

Change-Id: Ia11b98324e6f0c27e086778ddcb1afec67d92e6a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 18:21:06 +02:00