Commit Graph

5173 Commits

Author SHA1 Message Date
Thomas Hartmann
8af523cba2 QmlDesigner.PropertyEditor: adding support for url
Now url properties get a nice file browser when the sheet
is generated.

Change-Id: Ife4ab3081d92a5ccfab3c3d529de12c22f98d51a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-22 15:46:47 +01:00
Thomas Hartmann
ccd8b92c31 QmlDesigner.PropertyEditor: move template definitions from C++ to QML
Moving the template defintions for property types from C++ to QML.
This allows supporting more types by just editing TemplateTypes.qml.

Change-Id: Ic93a36067ac4a5e2736005b762b4ca4b7beb7cf7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-22 13:18:04 +01:00
Marco Bubke
abb7bb7880 QmlDesigner.NodeInstances: Use new designer support interface
Change-Id: Idfca7ea37f29df3c60b4a0eacd2b9ef80bbf5754
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:54:08 +01:00
Thomas Hartmann
187e423546 QmlDesigner.PropertyEditor: refactor QML file structure
All the "helper widgets" are now a plugin called HelperWidgets.
This allows reuse of these widgets from other places.

The QtQuick directory now really contains only the QtQuick specific
items.

Change-Id: I99dbbe43b25ee8631b6bb1effe993f951e19a8db
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:26:35 +01:00
Marco Bubke
1b23a4a410 QmlDesigner.NodeInstances: Fix color reset value
There is the color property with the r, g, b, a sub properties.
Before this change we only saved the default of the sub properties.

Change-Id: I11d4b0ed83cf8469836099a4f65942d7e8c8d8a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:16:07 +01:00
Thomas Hartmann
8629043061 QmlDesigner: remove Qt import legacy code
The directory was called Qt for legacy reasons.

Change-Id: I8e682961bf9960d7d7c94d1a3a4aa4fbffb35ccd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-21 17:51:28 +01:00
Marco Bubke
7ef1f9d124 QmlDesigner.NodeInstances: Deactivate componentComplete in VME
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 16:11:22 +01:00
Thomas Hartmann
960801b52c QmlDesigner.instances: fix for QmlPropertyCache
Setting the original parent to preserve data constructed from
the VME.

Change-Id: Ib3c31e129e2f25affee37c97f725c6bfe3fb0286
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:52 +01:00
Thomas Hartmann
bd67bd8d63 QmlDesigner: meta object fix
Change-Id: Ia5db0c5293eaf07d5141054f921a80987076532e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:25 +01:00
Thomas Hartmann
091d1116a2 compile fix for qml2puppet
Change-Id: Iad3c36e66e70c4ba1c885ffc10c4ea3f888aa820
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:27:04 +01:00
Marco Bubke
1600f55f62 QmlDesigner.NodeInstances: Disable text cursor
Change-Id: Ib27752624d658096903dc3b2660f2ee199d7869e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:23:20 +01:00
Thomas Hartmann
74d0ba65e1 QmlDesigner.propertyEditor: fixing color editing in Qt5
In Qt5 color does not implcitly get converted to string in QML.
Since this was never a documented feature we just adapt the
codein the property editor and convert color to string explictly if
needed.

Change-Id: I6b2b1dc356d2ec1c806c77450f49e793def2f5bb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-11-21 15:19:00 +01:00
Marco Bubke
1fdd172772 QmlDesigner.NodeInstances: Add debug output
Change-Id: I97ae422fce73ef3df62a66ef4bb925454176f891
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:12:40 +01:00
Marco Bubke
4f2ceefeff Add debug output command
Adds a infrastructure to get text information back to the client.

Change-Id: Ie5b92f875fe4cbd5f5a8e4d60a797efa0e5cbf70
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:12:07 +01:00
Marco Bubke
7ebc7bfb80 QmlDesigner.NodeInstances: Remove unused functions
Change-Id: I597144577c74090c2f8e58a2f3246acc922a43a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:09:45 +01:00
Marco Bubke
bd5881f5b2 QmlDesigner.NodeInstances: Disable animations
Change-Id: I714fbc9d1171e48bfad219ad37a03e5241851c0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:08:12 +01:00
Marco Bubke
befb414748 QmlDesigner.NodeInstances: No animations for positioners
The population should be not animated.

Change-Id: I51313e40d9cd266027ac0838036806d15576b511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:06:31 +01:00
hjk
efb3e91daa debugger: add gdb function to scan a corrupted stack for code references
Change-Id: I23377b0c75152b5bc27822c325d2fd2aeafd6f40
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 14:35:09 +01:00
Christian A. Reiter
c09f2249bb fix German double mapped key accelerator for menus "Datei", "Debuggen"
Change-Id: I249d730661279346de5c3654cdcfe335d5ead15e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-19 20:08:13 +01:00
hjk
c3ce444c8e debugger: add dumper for QStringRef
Change-Id: I6a3b732de5b2741ba2f19f012dd59373ce94377c
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-18 00:21:09 +01:00
hjk
0a5f0ba5af debugger: don't limit strings when "displayed"
Change-Id: I156f66f93deaa818d4409b2a02f0b2e046373656
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-17 18:57:52 +01:00
Ryan May
9884a76879 Add processing for array types to a standalone dumper.
This way, it can be overridden to make a custom dumper for an array of
data (such as creating an image display).

Change-Id: I0fda56872293554c6235e24f9af467c82f0b0f21
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 23:57:47 +01:00
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
2012-11-16 15:31:02 +01:00
hjk
3685ce7599 debugger: make string cutoff value configurable
Change-Id: I118016956a597ad689daa438f5517a47efe3cef0
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 13:59:47 +01:00
hjk
72c2a73bcb debugger: handle gdb.TYPE_CODE_FUNC as "generic" type
This seems not to have been used in the past.

Change-Id: I6e6ce80b8cdd1f20477cde2718e5283a886bb87a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 10:20:16 +01:00
hjk
0b22f94fb2 debugger: update gnuplot based dumper testcode
Change-Id: Iab6994da30c95c65541b94d95ddbb877f319ee3b
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 00:42:26 +01:00
Liang Qi
0f7039251f Add zh_TW into LANGUAGES in translations.pro
Change-Id: I46ad31d8e1a1161edbd443424be61d288f6f7ccb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-13 20:20:49 +01:00
hjk
c56b402b92 debugger: add "Display in Separate Window" option for std::string
Change-Id: I5273fa9bb4365f2a2c6b2a312064d5906fa44e13
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-10 22:46:34 +01:00
hjk
39b0afaa29 debugger: QObject dumper for Qt 5 was again broken
And still is (properties, signals, slots not visible), but at least
missing extraData does not stop the rest of the object dumping.

Change-Id: Iad203beee61d2ecfea63322d72aa9a231eb44291
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 20:59:26 +01:00
Orgad Shaneh
189ec06c99 Dumper: Avoid "set log redirect"
Files are not closed, and therefore are never deleted

Task-number: QTCREATORBUG-5048
Change-Id: Id198599e0ce11744ed6cb62adf48e86f73d6bece
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 20:58:22 +01:00
hjk
9a204ebe7a debugger: don't show large uint64_t as negative values
Task-number: QTCREATORBUG-8215
Change-Id: I1b7ef66f82b69c55d4a9778ad9ac79437d00022a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 11:43:12 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
2012-11-09 11:20:10 +01:00
Thomas Hartmann
0fd35fcc2e QmlDesigner.puppet: licence header fix
Task-number: QTCREATORBUG-8189

Change-Id: Ib1862dee47b3e340492c9321b9db92a7fe2b4786
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-06 15:43:07 +01:00
Przemyslaw Gorszkowski
54882fcf54 Update Polish translations
Change-Id: Ia8fcaf526c2f57f86074299cfadf5a3c4c0f00c1
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-10-30 12:01:30 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Topi Reinio
db9cc97d06 Application templates: remove Symbian remnants from deployment.pri
Removes TARGET.EPOCHEAPSIZE and TARGET.CAPABILITY definitions (both are
specific to Symbian platform and now obsolete).

Change-Id: I5d1f00717c5284945551cc2472af67e0d80b736a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-26 17:27:58 +02:00
Topi Reinio
2982545dbd QmlApplicationViewer: properly resolve install paths
This change makes QmlApplicationViewer applications find their qml
resources also in non-installed builds, regardless of the current
working directory.

On non-unix platforms applicationDirPath() is not used at all, and on
unix, it's used only for searching applicationDirPath/../path, which
is valid only after install. In-source or shadow-built apps find
their qml resources only if working directory == application
(executable) directory.

Path may refer to subdirectory in application directory. On windows,
non-installed application binary can also reside in /Release or
/Debug, so its resources need to be searched under parent directory
as well.

Change-Id: I81f602406787c20830c656fd5dffd11aa9b4afba
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-26 10:37:57 +02:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
2012-10-25 10:45:58 +02:00
Sergey Belyashov
4f0ca81770 Russian translation update
Change-Id: Id68bcd0c83842cb72503f2d8335df1b3a76b068c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2012-10-23 17:07:41 +02:00
Thomas Hartmann
2a624649af Support for QQmlVMEMetaObject and QmlPropertyCache
We have to derive NodeInstanceMetaObject from QQmlVMEMetaObject
to support e. g. alias properties.
The QmlEngine uses QQmlVMEMetaObject to resolve
alias properties.
Also we have to invalidate/recreate the
QmlPropertyCache if we add dynamic properties.

Change-Id: Id52dd8b380eadeb6f74b5171168f2f70c16be118
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 16:37:42 +02:00
Marco Bubke
1da50de19c QmlDesigner.NodeInstances: Improve matrix transformation
Compute the matrix to the instance parent instead of the item parent.

Change-Id: I48be1b2be4b2a0db44a6d464751d591df51507fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 11:16:24 +02:00
Marco Bubke
6994079f96 QmlDesigner.NodeInstance: Better content check
Fix rendering bug for repeaters.

Change-Id: I1c56bb63ff91cd8f58e349b0f8b038d1dd7d40e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 10:44:51 +02:00
jkobus
78b4b8ae6e Update Polish translations
Change-Id: I88ce5cc11761ec44305f569a61d4aea8c91f1c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-10-23 07:33:24 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Franklin Weng
565c695b32 Add Traditional Chinese translation
It's a clean version without all obsolete items.

Done-with: Juei-ray Tseng <e222et@gmail.com>

Change-Id: I609f8d6df15f75fa2728c90dab8b8f6d6c7db154
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-10-22 10:58:36 +02:00
hjk
3621e3e392 debugger: implement pretty printing for D arrays (gdc compiled)
Change-Id: If8bf60dcfbb52546bc9c49ba28adddf52163321e
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-21 20:24:34 +02:00
Orgad Shaneh
6aaaacd4e4 Dumper: Remove unused variables
Add a missing call to removeTempFile

Change-Id: Iea21102ed54e372f6c2991ac31fef008962f0638
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-20 14:51:13 +02:00
Marco Bubke
ac4df34db7 QmlDesigner.NodeInstances: Polish items for data collection
Change-Id: I3ca322ae72b546b0a55162f376a2895642c7a187
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-19 12:20:19 +02:00
mfekari
8b29f4439a Qnx: Update the wizard templates for Qt5 applications on BlackBerry
Change-Id: I4b17c59b1e25fd453d2fe09fb865832291ffc87c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-19 11:15:43 +02:00
Marco Bubke
e6fe6c0f1f QmlDesigner.NodeInstances: Fix compile
QQuickView::rootItem() changed to QQuickView::rootObject()

Change-Id: I6aff12f616a5e9a968d3a646bc635c4976750ed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-19 09:49:22 +02:00