Commit Graph

31594 Commits

Author SHA1 Message Date
Thomas Hartmann
660344536d QmlDesigner.PropertyEditor: adding FontSection
Change-Id: I9da1358851660e56e5298bfe58cf56725e81e439
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:39 +02:00
Thomas Hartmann
940a577755 QmlDesigner.PropertyEditor: adding standard section for text
Change-Id: I82bbb32c9b46c922dfa0163826c316638f35aa24
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:33 +02:00
Thomas Hartmann
d6e2b3a72a QmlDesigner.PropertyEditor: adding control for vertical alignment
Change-Id: I892ddd01509c7e0347670a7a329c8c2f7e0c7525
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:26 +02:00
Thomas Hartmann
6d4742a199 QmlDesigner.PropertyEditor: adding control for horizontal alignment
Change-Id: Ib9625b91e316157a3da4c09cd6c472c509c5387e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:56:17 +02:00
Thomas Hartmann
6c340c3031 QmlDesigner.PropertyEditor: show actual item type
We want to show the actual item type.

Change-Id: I3f977dd715bde4dd6da3b9d3e142d148461decb8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:55 +02:00
Thomas Hartmann
590aeb9dc8 QmlDesigner.PropertyEditor: fixing ButtonRow
We have to react to a change of checkedIndex

Change-Id: Icb2fd8efb236d6b2764ae901968f693f09c46d42
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:51 +02:00
Thomas Hartmann
a8ada95821 QmlDesigner.PropertyEditor: remove print statements
Some cleanup of print statements.

Change-Id: I9f1d83c988e2658c2e85f58a891c07047f4d64c1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-19 15:55:45 +02:00
Christian Kandeler
dcd6a9e9cf qbs project files: Remove workarounds for qbs bug.
The imports work as expected now.

Change-Id: I753483696bd30512451af4b8c39f95e30a513d40
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:28:21 +02:00
Christian Kandeler
203a775652 qbs project files: Rename defaults.js to functions.js.
The old name does not fit anymore.

Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:28:04 +02:00
Christian Kandeler
7e9a413141 Fix qbs build.
There was more stuff broken by the switch to Qt Quick 2 than were
originally noticed, and the original fix was buggy as well.

Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:27:55 +02:00
Christian Kandeler
2167788b3d qbs project files: Use FileInfo.fromWindowsSeparators().
Change-Id: I92f2d5866c721d33c86894fc65b75723c8596307
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:27:06 +02:00
Christian Kandeler
fc9347ffb1 Update qbs submodule.
Change-Id: I17ba07c9ccf884bc1c942581ec32f86058ddd071
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:26:50 +02:00
hluk
2e0508ca26 FakeVim: Handle deleted editor widget in insert mode
Change-Id: I7e6585872552a9b4a5bd126e7d01a8f9ea18339a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:18:58 +02:00
hluk
a636a933d0 FakeVim: Fix searching in visual mode and with commands
Search in visual mode should select text up to matched position.

Using commands should work with search movement; e.g. 'd2/needle<CR>'.
Commands should be also properly canceled if search movement fails.

Change-Id: Ic695dccaf3f36ccae2f2b1a93f888d5ba9805a78
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:17:37 +02:00
Marco Bubke
8c7a9a51ec QmlDesigner: Move DesignerActionManagerView in ViewManager
Change-Id: I28d1e1aff0bcb3172494c133bf383582127f28c3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-19 12:12:50 +02:00
hjk
7971b6e714 Debugger: Make dumpers a bit more Python 3.x friendly
Looks like Ubuntu 13.10 will ship GDB linked to Python 3.3.

Change-Id: I748e8461531a3554d27ebfbf7af33385f69586c0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 12:09:52 +02:00
Thomas Hartmann
a60a3b43a7 QmlDesigner.Rewriter: changing Q_ASSERTS to QTC_ASSERTS
These ASSERTS have no fatal consequences (data losss, guaranteed crash).
Therefore we can use QTC_ASSERT instead.

Change-Id: Ia155f23d06f41432ba7504459816f000d4fe8f11
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-19 10:56:56 +02:00
jkobus
5d15076ea1 Fix compilation of generichighlighter test on Windows
Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-18 17:25:41 +02:00
Nikolai Kosjar
8e62876f64 QbsProjectManager: Fix include
Change-Id: Ibe7f90fa7c4374c936dbe342ec2d3c056904d42b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-18 17:00:39 +02:00
hjk
7de31d3a15 QmlDesigner: Cleanup ResizeIndicator header
Change-Id: Id7b278cf93a8f657b6cc9d087ef5628d3e1625fe
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 14:57:05 +02:00
hjk
88b70ed8f6 QmlDesigner: Compile fix with namespaced Qt
Change-Id: I51d25ac299ecd0374ef5c01e5d4c686a8730e082
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-18 14:13:00 +02:00
Marco Bubke
91cb9b0474 QmlDesigner: Remove StatesEditorWidget in StatesEditorView
Change-Id: I2d858ed2cd90f8e4297114cc47502b5a8d57f638
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:58:19 +02:00
Thomas Hartmann
5e85fc175e QmlDesigner: Use native text rendering
Change-Id: I97f73ff82e4aac6af7f6b8d04364339ba484910a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-18 13:44:27 +02:00
Thomas Hartmann
374bedfb00 QmlDesigner.StatesEditor: create widget on demand
Otherwise the widget is created but never inserted in the widget
hierarchy, if the designer was never activated.
In this case the widget was not deleted.

Task-number: QTCREATORBUG-10169

Change-Id: Ic86d540a7044c07e272357edafd4d2f81fd1b7a4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-18 13:41:05 +02:00
Marco Bubke
062f6baca0 AmlDesigner: Refactor DesignerActionManagerView in a extra file
Change-Id: I50a74778f5fa0895110f2157728b9d99b677a6c5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:19:44 +02:00
Marco Bubke
3130aacc82 QmlDesigner: Add ContentNotEditableIndicator
If you hover over a tab the content will be visulized as non editable.

Change-Id: If7fcc8aaa319e0f952f501f6e9e2fc767b89b636
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 13:19:38 +02:00
Marco Bubke
2d8c0dd480 QmlDesigner: Add blur render image
To give the impression that the content is non editable.

Change-Id: I1869d02a27b2d1a7c2c12abb9a8d8d24068adf22
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 12:03:24 +02:00
Marco Bubke
6a6264db25 QmlDesigner: Add AbstractFormEditorTool::toFormEditorItemList
Change-Id: I3b47a82b64932dc42bc2948ce4a2e8e290fc0324
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 12:03:18 +02:00
Marco Bubke
97b3e98d32 QmlDesigner: Tab should be not movable anymore
Change-Id: I3a2e433157c65deb6ca85c8128046ce535ec59be
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-18 12:03:13 +02:00
Orgad Shaneh
1cfca29696 TextEditor: Do not trigger autocomplete after user aborts...
... for the same function

Task-number: QTCREATORBUG-5748
Change-Id: Iadf5be76c24f95cf057c2112a8248bea2a9e20cf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-18 11:26:36 +02:00
Aurindam Jana
c9a851c649 QmlProfiler: Avoid generic property types in QML
Change-Id: I4dddf19d37004f59bfbe75b45e0b626bf1563fa2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-09-18 10:37:33 +02:00
Aurindam Jana
a2d771b41e QmlProfiler: Update Qt Quick 2.0 to Quick 2.1
Change-Id: Ib40cf370798e12540d81e2f7ec532bb119293e4e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-09-18 10:37:21 +02:00
Daniel Teske
d744919b67 Android: Device selection dialog, fix error messages
Change-Id: Ie9d1535ae93ca0a28bf7f6ccd3ee73bcb783be4c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 18:25:41 +02:00
Christian Kandeler
8f7bbb9a08 IoUtils test: Fix qbs project file.
Apparently, that define is only needed for qmake, if at all.

Change-Id: I12b6768760deddc2a780da105f33857eec6e8710
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-17 18:09:55 +02:00
Thomas Hartmann
19e9030d4c QmlDesigner.ItemLibrary: adding SplitView
Change-Id: I3bab4c2749ef87058015ead3218c5dc6c14bee98
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-17 15:35:27 +02:00
Thomas Hartmann
16aa789767 QmlDesigner.SubComponentManager: Do not parse if detached
If detached from rewriter do not parse directories.

Change-Id: Ie07e732d5e09b337d43221df4aa88c7e62aac55b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-17 15:35:22 +02:00
Joerg Bornemann
2fd3c8bd9c C++: fix ResolveExpression for string literals
ResolveExpression now correctly handles wide and
UTF-n string literals.

Change-Id: Ide2373ffdc4c9e1e4b53236a8e2782653d15e687
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-17 15:03:43 +02:00
Thomas Hartmann
0d0606a6d9 WelcomePage: Use native text rendering
Task-number: QTCREATORBUG-10167

Change-Id: I0bf3d28ba2837cdbfa4f5a38148ee00fe2b1c897
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-09-17 14:45:14 +02:00
Nikolai Kosjar
984ca9ff3d GLSL: Initialize member pointer to 0
Task-number: QTCREATORBUG-10166

Change-Id: If57b0c95487bcfe2c11c25a847d26c0746c379b2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-17 13:56:40 +02:00
David Kaspar
59859d03f9 Qnx: Fixing BarDescriptorEditor to prevent loosing syntax highlighting
Task-Number: QTCREATORBUG-10039

Change-Id: I8a6b80d18da1be0697bd8aaceb5d8670105a8f49
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-17 13:38:12 +02:00
Christian Kandeler
2a3ef09473 Device support: Make IDevice::executeAction non-const.
Presumably this function is currently const because no current
implementation actually changes device properties, but there
is no reason why that should not be allowed.

Change-Id: I80e4355be70e40bca9df5e1287a1d1d3f60c6534
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-17 13:36:08 +02:00
Tobias Hunger
0b5639f735 KitInformationConfigWidget: Make id of KitInformation accessible
Make the id of the kitinformation the config widget is configuring
accessible from the widget.

Change-Id: I15af2cfc18ab2ba012d43c3c6b71ee0011f994ad
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-17 13:25:16 +02:00
Tobias Hunger
d2adc30335 BuildConfigurationFactory: Refactor code
Refactor the code of the build configuration factories. The idea is to
generalize the code so much that we can allow plugins to install
custom build configuration factories for the platforms they support.

To support this use case the following changes where done here:
 * BuildInfo class was introduced to describe one build configuration that
   can be created by a factory.
 * Factories report a list of BuildInfo to describe what they can produce.
   This fixes the need for factories to implicitly create one buildconfiguration
   and then create another one 'officially' to support debug and release build
   configurations to be set up for projects.
 * Do no longer work around factories to create build configurations.

Change-Id: Ic372e4a9b5c582633b467d130538948472b89d91
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 12:00:01 +02:00
Thomas Hartmann
ec436a6d64 QmlDesigner.PropertyEditor: initial prototype for QtQuick 2
Change-Id: I85eac02934cd5f7f2f4664b9642c55bb3a23aa1e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-17 10:15:46 +02:00
Tobias Hunger
d7674e45c2 KitInformation: Delete subwidgets in destructor
Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 10:13:26 +02:00
Kai Koehne
38ab088cb1 plugins: Simplify checks for declarative
We can expect people with Qt 5.1 to also have QtQuick.

Change-Id: I84b0323c6ea11b46f3ee41c0bbdc5f059643f208
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-17 09:57:55 +02:00
Christian Kandeler
3ae8d6b36a Fix qbs build.
Commit cf56178d introduced an impressive amount of syntax errors.

Change-Id: Ibaf8b8384b06ee92b658b71f08ac8d14e92c19b0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-17 07:46:06 +02:00
Thomas Hartmann
5ed046f1c1 QmlDesigner.Navigator: more checks for the reparenting button
We check for defaultPropertyIsComponent() and the metaInfo has to be valid.

Change-Id: I957c8440facec0ba54e527f2eda40926c5637b31
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 17:00:27 +02:00
Thomas Hartmann
2b8ab0afd1 QmlDesigner.FormEditor: Adding check to FormEditorItem::isContainer
An item is not considered a container if the default property is
a component.

Change-Id: I73453fb17d6c181cdd79cd6620307e5c30cac09d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 17:00:23 +02:00
Thomas Hartmann
494d16f3cc QmlDesigner.FormEditor: using FormEditorItem::isContainer in MoveTool
Change-Id: Ie30c0409cb2288c8c2cf649a92e7b54aa9481cb2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-16 16:52:44 +02:00