Commit Graph

4946 Commits

Author SHA1 Message Date
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
Tim Jenssen
84bc03c025 QmlDesigner: fix Qt4 compile
Change-Id: Iad9bd3eaff445b9329452d89da0c641e8c8f25df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-05 22:27:08 +02:00
Tim Jenssen
e917559319 QmlDesigner: prioritize puppet processes a bit
Change-Id: I97d846cb46851f8f3067d839aeb0b856298ed0c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:59:27 +02:00
Tim Jenssen
b7dbbc6ef0 QmlDesigner: fix crash on mac
Came from two deletions at the same time QCache::remove and
delete on sharedMemory.QmlDesigner:

Change-Id: I6a29cf160c8e81ecd955cf36999edc639fbbb63f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 16:30:47 +02:00
Tim Jenssen
d315a71c30 QmlDesigner: cleanup code
Change-Id: Ibebef6313113ff0097586373795e6117b7112876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:08 +02:00
Tim Jenssen
0370fa214a QmlDesigner: Use Q_GLOBAL_STATIC_WITH_ARGS for the global hash
To be sure that the shared memories are removed at process exit.
And fix that createSharedMemory reuse possible already existing shared
memories now. ("take" -> "[]")

Change-Id: Idcc99ba42b862b862d5403ecf3b781a27fdf757f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-05 14:27:02 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
Marco Bubke
80a39815f0 QmlDesigner: Limit native key to 31 letter
OS X is only supporting a maximum of 31 letters for shared memory names.

Change-Id: I61351228decaa3fa7ec19a6035620ab932cf5386
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:38:13 +02:00
Christian Stenger
ea675821e3 QmlPuppet: Fix linking on MacOSX
Change-Id: Ib38b0059c24b9bddb2aa79ba45347e00f8972c77
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 10:50:38 +02:00
Thomas Hartmann
db5a4ac447 QmlDesigner.PropertyEditor: Fix left padding for SpinBox
We use left padding instead of a prefix.

Task-number: QTCREATORBUG-12781
Change-Id: I0c89e3592ad0ca9c498d33930ef2742ec970f8bb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 18:17:39 +02:00
Daniel Teske
daf5ff8c88 Welcome Screen: Show clone Session also for the default session
Task-number: QTCREATORBUG-10906
Change-Id: I9a3143eecf663085988eaff0fc3d34bd653f9c0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-01 15:02:16 +02:00
Tim Jenssen
0cfab4ca43 QmlDesigner: using old QRegExp works on all Qts
Change-Id: I9650efac738c76b8ace531416ac8e4664f637ffb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 11:21:41 +02:00
Tim Jenssen
186f82a730 QmlDesigner: SharedMemory key needs to be the same with all Qts
Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 11:17:30 +02:00
Tim Jenssen
2bfd14dbf8 QmlPuppet: Fix compile with Qt older than 5.2
Change-Id: I0ef3c5e374b1b01c22b553b99dfbd8eb7783fa90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-01 10:40:21 +02:00
Marco Bubke
0da08c227f QmlDesigner: Use a POSIX shared memory for unix
QSharedMemory is using SVR4 shared memory for unix which is limited to
4 MB globally which is really hurting the performance for the designer.
POSIX shared memory is lifting some of this constraints but still has
some bugs on Max OS but generally works better.

Change-Id: I74c1ffd56495f408cd9340cd159190a1175a4086
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-31 16:48:27 +02:00
Tim Jenssen
5778a39317 QmlDesigner: read window mock from file
Change-Id: Ic525b1d3ac18c42c6abb6a93195e220465dd017f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 13:44:01 +02:00
Marco Bubke
0ee609f8fc QmlDesigner: Fix reset width and height
Task-number: QTBUG-38426
Change-Id: I28e9ed70042c118ff65801c4d07e5a67dc7c3db1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 12:34:58 +02:00
Marco Bubke
62645e33c8 QmlDesigner: Fix quotes for mac quick1 puppet
Task-number: QTCREATORBUG-12746
Change-Id: If749457cd5f9336f7b1708cd05ca073925177a3b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-30 12:30:50 +02:00
Thomas Hartmann
49d2450c01 QmlDesigner.PropertyEditor: Set a proper maximum value for radius
Task-number: QTCREATORBUG-12574
Change-Id: I5be4fb1e0004a9f1ab32d9b83e2048031cfb3eb6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 11:48:42 +02:00
Thomas Hartmann
30c02e78b0 QmlDesigner.PropertyEditor: This is not a property of PathView
This is a property of ListView and GridView.

Task-number: QTCREATORBUG-12507
Change-Id: Ie3f6db2f90bc8b67bcc208c709b87717f653525d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 11:43:01 +02:00
Thomas Hartmann
616f01bc2e QmlDesigner.PropertyEditor: Do not show ExtendedFunctionButton for id
Change-Id: I3ccc2e341591913d1645b3e748ee07acf7cecee7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 11:41:59 +02:00
Thomas Hartmann
882eb4f335 QmlDesigner.PropertyEditor: Fixing usability issue for color editing
Task-number: QTCREATORBUG-12621
Task-number: QTCREATORBUG-12563

Change-Id: I6834633be92f2fcdf85995604490ceea14af9ef6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 10:36:00 +02:00
Marco Bubke
8f3bb6421b QmlDesigner: Fix enumerations properties
Task-number: QTCREATORBUG-12741
Change-Id: I1ef1909d585732a39bbf80b90512851a10f60600
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 19:29:08 +02:00
Marco Bubke
3146340211 QmlDesigner: Get whole values for value types too.
Task-number: QTCREATORBUG-12130
Change-Id: Ic43826060d9ce38aded7fc3a68dff2ea6860bfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 17:54:39 +02:00
Thomas Hartmann
27afbe49ea QmlDesigner.PropertyEditor: Select new created gradient stop
Task-number: QTCREATORBUG-12507
Change-Id: I2d2bc4d478e53b5b5a0faeeda68cd95d7c85377e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 15:40:05 +02:00
Thomas Hartmann
b46dd452d2 QmlDesigner.PropertyEditor: Use DesignerScrollViewStyle
I set corner to an empty item, because otherwise it looks weird if both
scrollbars are visible.

Change-Id: I149e2ff58f9e9f71b2bb9f435fd64388cbf5529c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 13:52:46 +02:00
Thomas Hartmann
2dd9a0cc21 QmlDesigner.PropertyEditor: Fix selection in gradient editing
Since property change signals can be emitted in any order we have to rely
on selection changed signals to guarantee a valid state.

I use the isInValidState which is only true after all properties have been
setup correctly after a selection change for this.

I added the signal selectionChanged for this.

Task-number: QTCREATORBUG-12642
Task-number: QTCREATORBUG-12506
Change-Id: Idf3bbe8236ece541ca267efb1bd68e0737c99716
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-28 18:29:40 +02:00
Thomas Hartmann
e4189136ac QmlDesigner.PropertyEditor: Fix bug in line edit
I gave writeValueManually a proper name and added a missing check.

Task-number: QTCREATORBUG-12642
Change-Id: I67b0d7754647c29ef378d6f12f023c8a4e728cd2
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-28 18:29:32 +02:00