Commit Graph

5173 Commits

Author SHA1 Message Date
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
Sergey Belyashov
a4db6db358 Update Russian translation
Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-15 17:24:09 +02:00
Oswald Buddenhagen
df1f576666 use DISTFILES instead of OTHER_FILES in docs, templates, and editors
the latter variable is entirely meaningless to qmake and should have
never been recognized by creator. unfortunately, qmake's dist target
wasn't very useful before qt 5.4, so it didn't occur to anybody to
actually use the variable associated with it, even though it is
semantically exactly the right thing.

Change-Id: I249857f54fdc38fb5ecac0f608e5f4140624c23c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-15 13:19:27 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:51:02 +02:00
hjk
1ee2759067 Debugger: Fix boost::unordered_set dumper
Change-Id: Ib356baed758437f5b549df060ca3ee62ee61b9fb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-15 12:12:13 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
hjk
2776536a7e Debugger: Fix QHash display of "compact" keys
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-12 15:36:01 +02:00
Thomas Hartmann
a9f6f2519b QmlDesigner: Allow negative spacings for positioners
Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-11 11:15:54 +02:00
Thomas Hartmann
ec26e687f4 QmlDesigner.PropertyEditor: Allow centering and anchoring at the same time
With this patch center anchor and right/left/top/right anchors can
be used at the same time.

Task-number: QTCREATORBUG-11455
Change-Id: I3114eb76bdfc4226e78fd711e04849d7d7d7cd38
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-10 18:18:49 +02:00
Tim Jenssen
4ca49dc909 QmlDesigner: add more specifics
Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-09 16:21:44 +02:00
Thomas Hartmann
61b699b336 QmlDesigner.Puppet: Adding size hints to Window mockup
Without defining the properties, the properties do not work and
do not get notified properly. They are also missing defaults which
breaks "resetting".

Task-number: QTCREATORBUG-13004
Change-Id: Ib36f39770930be486225b45169d2ebdb53df8df4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-09 10:38:07 +02:00
Thomas Hartmann
34fb3d6a5a QmlDesigner.PropertyEditor: Change step size for reals
the default step size of 1 does not make much sense for reals.

Task-number: QTCREATORBUG-12985
Change-Id: I28be2ca8de37f1032e8fbbe785913ae5a8f6be33
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 15:45:04 +02:00
Christian Stenger
bfdbd9c1cb Templates: Remove wrong version information
Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 15:26:13 +02:00
Thomas Hartmann
b66155cf17 QmlDesigner.PropertyEditor: Change default editor for color
This template breaks the layout and is currently unusable.
Therefore we replace it by a string editor.

Change-Id: I0818d006a4516f34954d5406ee4074664e909891
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 12:17:24 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +02:00
Tim Jenssen
d6fbffbff0 QmlDesigner: clean up QWeakPointer use
Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-05 15:16:46 +02:00
hjk
aba1d0a1cb Debugger: Use hard string limit for displayed strings
Currently 100000 to balance between usability (~14sec here)
and usability (e.g. size of typical source text files)

Change-Id: I8a54c81b104a87ec03babf85cbda2e6cea7d3f70
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-04 17:19:37 +02:00
Christian Stenger
275f491e1b Templates: Fix integration of BlackBerry wizard
Issue was introduced in d3126c5050.

Change-Id: Icd06050e6eb0c702f5dc079fe94c2b4496a9bcba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-04 10:42:19 +02:00
Tobias Hunger
d3126c5050 Wizards: Consistently use singular in categories
Change-Id: I56adf09eb6c049302ae644e70f3475fd4a4fd4bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-03 16:52:57 +02:00
Eike Ziller
49db3a450a Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
2014-09-03 16:08:02 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
hjk
0102455fd0 Debugger: Fix a few Creator related dumpers
Change-Id: I53d857119872200938c352dbceb8a327dee2a7eb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-01 23:36:44 +02:00
Robert Loehning
b382690dbd German translation of 3.2 branch
Change-Id: I634d31d3dd6421b5afdd32350513c61bf7ad683b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-01 16:07:43 +02:00
hjk
8b5bca7223 Rename 'vim (dark)' color scheme to 'Dark'
The darkness has not much to do with vim, and people stay
confused about the relation of the color scheme and FakeVim.

Change-Id: Ie04089045314321a60ac284551367d0b637b2e7d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-01 10:41:12 +02:00
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.

* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.

Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 14:10:41 +02:00
hjk
e3a1240f71 Debugger: Also display row/column in cooked QModelIndex display
Task-number: QTCREATORBUG-12926
Change-Id: I59f7ab45d9bf530d020945af6db608c4e83a66b7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 13:22:44 +02:00
hjk
9d1bc2fdd3 Debugger: Add boost::unordered_set dumper
Change-Id: I42c39ccfe979023e2aa8957132a0ef3404f45aa8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 00:43:01 +02:00
Robert Loehning
92b9f421c0 Fix typo in French translation
Task-number: QTCREATORBUG-12912
Change-Id: Ie0794d46d75caadcb3155a25d2950e1e464f7079
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
2014-08-28 14:05:22 +02:00
jkobus
96a32bf2cb Add qtquick 2.3 and qtquickcontrols 1.2 templates
Change-Id: Id71a21b273d2d156cb55033ad6a9ae2bcf5565ca
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-08-28 12:37:06 +02:00
Thomas Hartmann
83378d2af3 QmlDesigner: Fix typo
Change-Id: I36c8393ace088d7702d1771e806e1e420eb8bd95
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-08-27 10:15:06 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-27 08:44:34 +02:00
jkobus
2693e08768 Add an Open menu action to qt quick templates
Task-number: QTCREATORBUG-11728
Change-Id: I7f3ad47a2fe4a247efefe57a0de5149c64ac2456
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-26 10:08:14 +02:00
Thomas Hartmann
fb87aa97bd QmlDesigner.PropertyEditor: Commit color string if selection changes
The LineEdit in the ColorEditor is not binded to a backendvalue
and we react manually to isAccepted (writeValueManually is set to true).

Because of this (and the famous focus bugs), we do not set the color,
if the selection is changed or the user enters edit mode without
pressing enter.

This patch adds the signal onCommitData to LineEdit and we react to
the signal. Because the the change of the backendvalue is delayed by
a timer we set the color immediately on the backend if we are not in gradient
editing mode.

Task-number: QTCREATORBUG-12841
Change-Id: Ic98640398c2c46b5e529780b4a9638c90760063f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-21 14:23:55 +02:00
Thomas Hartmann
b6e6e0123c QmlDesigner.NodeInstances: Fixing enums for int properties
There is no easy way to convert an enum (e.g. Qt.Vertical) to the
integer value without the meta object/QMetaEnum.

For this reason we evluate the enum as an expression
if the target property is int.

Without this patch enums do not work at all for properties defined as int.
Change-Id: I9363a84eef1bf4a3ed2c40b35f7439e249e9bd98
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-21 13:59:15 +02:00
Thiago Macieira
34d897165d Fix the build: add missing #includes
<QWidget> for QWidget, <QDataStream> for QDataStream and <QMetaObject>
for Q_GADGET (technically, qobjectdefs.h)

Change-Id: Ia7e8b12ff4c67827bb7782a0337714e330de1db1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-18 15:11:56 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Takumi Asaki
d5800038e4 Update Japanese translation.
Change-Id: Iede96bf4c12579ee84524130aaa174ee40991cf2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-13 11:26:18 +02:00
Daniel Teske
21b6d857fb Android: Fix link to fixed gdbs
Since the problem is close platform link to the parent directory.

Change-Id: I6e5128e9d00ed576ce048d1d48db61e6f758a979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-12 14:14:12 +02:00
Tim Jenssen
b4599aa250 QmlDesigner: fix binding loops while resizing
Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 13:58:03 +02:00
Tim Jenssen
395eacd5a4 QmlDesigner: remove second ComboBox entry
and sort it alphabetical

Change-Id: I944dea556e73181ab29cc167548a4e0f13485a99
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 12:16:12 +02:00
Charles Huet
6af4b5a178 CMakeEditor: updated cmake.xml highlighting file from upstream.
Task-number: QTCREATORBUG-3272
Change-Id: I8c5f98cc434920f9a9a0917e3395d187588fb1c2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-12 12:14:51 +02:00
Thomas Hartmann
75d9ce0f96 QmlDesigner.NodeInstances: improve mockup for Window
The window mockup now contains some support for the toolbar of
ApplicationWindow. The status bar is always invisble and just
a place holder.

I reduced the import for QtQuick 2 to support Qt 5.1.

Change-Id: Ic2241bf3fdd0d2967f988add06075a9e145a1cbc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:53:25 +02:00
Thomas Hartmann
6cd67dffef QmlDesigner.PropertyEditor: Fix Layout in Url template
An Url is not translatable.

Change-Id: Id68e03ff8c05e7e7f7c1c419d482ce40aaef4e8b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:45:08 +02:00
Thomas Hartmann
bfdffd2a7d QmlDesigner.NodeInstances: Check expressions
I do not see any reason to set an expression that contains a
code block.

Change-Id: I74960a6bac741db46d86e33299e8b1669e781e65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:44:53 +02:00
Christian Stenger
30ab57293e Templates: Fix sample wizard
Change-Id: I9c388478b2a5491f42bc653d5925b6b01ab83831
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-11 12:06:44 +02:00
Viktor Ostashevskyi
e0abca4be7 Ukrainian translation update for 3.2
Change-Id: Ieea87dd1f04aa6e23350636220ca872686745f5d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-08 16:37:17 +02:00
Thomas Hartmann
03ac986413 QmlDesigner.NodeInstances: Adding more objects to the ignore list
There is no real reason to ever instantiate those.

Change-Id: I1bb86b5f5794f10bf2cad124499df6ee8add6909
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:33 +02:00
Thomas Hartmann
f112076227 QmlDesigner.ComboBox: Minor fix
If we cannot read the index we set the index to 0.

Change-Id: Id990ca1640f9314931af9249c798c8b51ea5c0bb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:13 +02:00
Thomas Hartmann
0b0666909c QmlDesigner.PropertyEditor: Indicating if a CheckBox is disabled
Change-Id: Ica4016cc45c66720c189f95ed69df84a0558c1fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-07 12:37:33 +02:00
Thomas Hartmann
b625f3983d QmlDesigner.PropertyEditor: Fix CheckBox styling
We should use the spacing property.

Change-Id: Ie0b6a58bb4e7de19a09a90fd07a7b41f52790ce7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-06 14:34:45 +02:00