aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-09307-2138/+2443
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.1' into 3.2Eike Ziller2014-09-291-0/+1
|\ | | | | | | Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
| * Fix the build: add missing #includes3.1Thiago Macieira2014-08-181-0/+1
| | | | | | | | | | | | | | | | | | <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>
* | Debugger: Fix QHash display of "compact" keyshjk2014-09-265-36/+56
| | | | | | | | | | | | | | | | Add make std::string usable as "compact" key. Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6 (cherry picked from commit 2776536a7efd6758de1d6720b2c05a9fe0bc65a5) Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Debugger: Wiggle LLDB startuphjk2014-09-231-1/+4
| | | | | | | | | | | | | | | | | | | | LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error to get it start up again. Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969 (cherry picked from commit 1af0f77ea9c4cc6407dc193f53023c103e827168) Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | German translation for late stringsRobert Loehning2014-09-171-6/+132
| | | | | | | | | | | | Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Update Russian translationSergey Belyashov2014-09-151-1968/+2657
| | | | | | | | | | | | Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QmlDesigner: Allow negative spacings for positionersThomas Hartmann2014-09-114-8/+8
| | | | | | | | | | Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.PropertyEditor: Allow centering and anchoring at the same timeThomas Hartmann2014-09-101-8/+16
| | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner: add more specificsTim Jenssen2014-09-091-30/+22
| | | | | | | | | | | | | | Fix: QTCREATORBUG-12798 Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.Puppet: Adding size hints to Window mockupThomas Hartmann2014-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner.PropertyEditor: Change step size for realsThomas Hartmann2014-09-081-0/+1
| | | | | | | | | | | | | | | | 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>
* | Templates: Remove wrong version informationChristian Stenger2014-09-085-5/+5
| | | | | | | | | | | | | | 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>
* | QmlDesigner.PropertyEditor: Change default editor for colorThomas Hartmann2014-09-081-1/+2
| | | | | | | | | | | | | | | | 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>
* | German translation of 3.2 branchRobert Loehning2014-09-011-2545/+3397
| | | | | | | | | | Change-Id: I634d31d3dd6421b5afdd32350513c61bf7ad683b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Fix typo in French translationRobert Loehning2014-08-281-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-12912 Change-Id: Ie0794d46d75caadcb3155a25d2950e1e464f7079 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Add qtquick 2.3 and qtquickcontrols 1.2 templatesjkobus2014-08-2828-12/+239
| | | | | | | | | | Change-Id: Id71a21b273d2d156cb55033ad6a9ae2bcf5565ca Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlDesigner: Fix typoThomas Hartmann2014-08-276-19/+19
| | | | | | | | | | Change-Id: I36c8393ace088d7702d1771e806e1e420eb8bd95 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Add an Open menu action to qt quick templatesjkobus2014-08-264-0/+16
| | | | | | | | | | | | Task-number: QTCREATORBUG-11728 Change-Id: I7f3ad47a2fe4a247efefe57a0de5149c64ac2456 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner.PropertyEditor: Commit color string if selection changesThomas Hartmann2014-08-212-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner.NodeInstances: Fixing enums for int propertiesThomas Hartmann2014-08-212-42/+34
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update Japanese translation.Takumi Asaki2014-08-131-2706/+3319
| | | | | | | | | | | | Change-Id: Iede96bf4c12579ee84524130aaa174ee40991cf2 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Fix link to fixed gdbsDaniel Teske2014-08-121-1/+1
| | | | | | | | | | | | | | Since the problem is close platform link to the parent directory. Change-Id: I6e5128e9d00ed576ce048d1d48db61e6f758a979 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner: fix binding loops while resizingTim Jenssen2014-08-122-14/+10
| | | | | | | | | | Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner: remove second ComboBox entryTim Jenssen2014-08-121-31/+30
| | | | | | | | | | | | | | and sort it alphabetical Change-Id: I944dea556e73181ab29cc167548a4e0f13485a99 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.NodeInstances: improve mockup for WindowThomas Hartmann2014-08-111-1/+40
| | | | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner.PropertyEditor: Fix Layout in Url templateThomas Hartmann2014-08-111-0/+2
| | | | | | | | | | | | | | An Url is not translatable. Change-Id: Id68e03ff8c05e7e7f7c1c419d482ce40aaef4e8b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.NodeInstances: Check expressionsThomas Hartmann2014-08-111-0/+11
| | | | | | | | | | | | | | | | 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>
* | Templates: Fix sample wizardChristian Stenger2014-08-111-1/+1
| | | | | | | | | | Change-Id: I9c388478b2a5491f42bc653d5925b6b01ab83831 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* | Ukrainian translation update for 3.2Viktor Ostashevskyi2014-08-081-1105/+4183
| | | | | | | | | | Change-Id: Ieea87dd1f04aa6e23350636220ca872686745f5d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QmlDesigner.NodeInstances: Adding more objects to the ignore listThomas Hartmann2014-08-081-0/+9
| | | | | | | | | | | | | | There is no real reason to ever instantiate those. Change-Id: I1bb86b5f5794f10bf2cad124499df6ee8add6909 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.ComboBox: Minor fixThomas Hartmann2014-08-081-1/+4
| | | | | | | | | | | | | | If we cannot read the index we set the index to 0. Change-Id: Id990ca1640f9314931af9249c798c8b51ea5c0bb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.PropertyEditor: Indicating if a CheckBox is disabledThomas Hartmann2014-08-071-0/+1
| | | | | | | | | | Change-Id: Ica4016cc45c66720c189f95ed69df84a0558c1fc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.PropertyEditor: Fix CheckBox stylingThomas Hartmann2014-08-062-5/+1
| | | | | | | | | | | | | | We should use the spacing property. Change-Id: Ie0b6a58bb4e7de19a09a90fd07a7b41f52790ce7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: fix Qt4 compileTim Jenssen2014-08-051-1/+1
| | | | | | | | | | Change-Id: Iad9bd3eaff445b9329452d89da0c641e8c8f25df Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: prioritize puppet processes a bitTim Jenssen2014-08-051-0/+15
| | | | | | | | | | Change-Id: I97d846cb46851f8f3067d839aeb0b856298ed0c0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner: fix crash on macTim Jenssen2014-08-051-1/+0
| | | | | | | | | | | | | | | | 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>
* | QmlDesigner: cleanup codeTim Jenssen2014-08-051-8/+2
| | | | | | | | | | Change-Id: Ibebef6313113ff0097586373795e6117b7112876 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner: Use Q_GLOBAL_STATIC_WITH_ARGS for the global hashTim Jenssen2014-08-052-8/+14
| | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner: Limit native key to 31 letterMarco Bubke2014-08-041-4/+5
| | | | | | | | | | | | | | 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>
* | QmlPuppet: Fix linking on MacOSXChristian Stenger2014-08-041-1/+1
| | | | | | | | | | Change-Id: Ib38b0059c24b9bddb2aa79ba45347e00f8972c77 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.PropertyEditor: Fix left padding for SpinBoxThomas Hartmann2014-08-012-1/+1
| | | | | | | | | | | | | | | | We use left padding instead of a prefix. Task-number: QTCREATORBUG-12781 Change-Id: I0c89e3592ad0ca9c498d33930ef2742ec970f8bb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: using old QRegExp works on all QtsTim Jenssen2014-08-011-2/+0
| | | | | | | | | | Change-Id: I9650efac738c76b8ace531416ac8e4664f637ffb Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | QmlDesigner: SharedMemory key needs to be the same with all Qtsv3.2.0-rc1Tim Jenssen2014-08-011-6/+2
| | | | | | | | | | Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | QmlPuppet: Fix compile with Qt older than 5.2Tim Jenssen2014-08-011-0/+17
| | | | | | | | | | | | Change-Id: I0ef3c5e374b1b01c22b553b99dfbd8eb7783fa90 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: Use a POSIX shared memory for unixMarco Bubke2014-07-318-56/+774
| | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner: read window mock from fileTim Jenssen2014-07-303-12/+12
| | | | | | | | | | Change-Id: Ic525b1d3ac18c42c6abb6a93195e220465dd017f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: Fix reset width and heightMarco Bubke2014-07-301-2/+2
| | | | | | | | | | | | Task-number: QTBUG-38426 Change-Id: I28e9ed70042c118ff65801c4d07e5a67dc7c3db1 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: Fix quotes for mac quick1 puppetMarco Bubke2014-07-301-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-12746 Change-Id: If749457cd5f9336f7b1708cd05ca073925177a3b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | QmlDesigner.PropertyEditor: Set a proper maximum value for radiusThomas Hartmann2014-07-301-0/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-12574 Change-Id: I5be4fb1e0004a9f1ab32d9b83e2048031cfb3eb6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 10:01:33 +0000