feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4987 Commits

Author SHA1 Message Date
Eike Ziller
8fe04ce0ad Merge remote-tracking branch 'origin/3.0' 2013-11-19 07:41:47 +01:00
jkobus
9ad57119fa Reorder component set (make Qt Quick 2.0 the default) 
Change-Id: I1735a3785e8e96bf3550213c7efbd6b879f61730
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-18 17:09:11 +01:00
hjk
ab52154010 Debugger: Use natural order when displaying a map 
Task-number: QTCREATORBUG-10781

Change-Id: I20e6ee87efd445a32539f6600fa90a5192c72114
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-11-18 15:17:55 +01:00
Marco Bubke
2f040fc6ad QmlDesigner: Change version number of the puppet to 2 
Change-Id: I0aafaf76a6d4d6edfd4c3ccc73b702edbbfaa385
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-18 12:42:04 +01:00
Marco Bubke
765242637a QmlDesigner: Fix composite hack in the ObjectNodeInstance 
There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-18 12:41:43 +01:00
hjk
7f6c793f75 Debugger: Fix passing of maximum string length 
Change-Id: I96498b93bb1632de8ca960ae24ec54e31f8c0897
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-17 18:28:51 +01:00
Thomas Hartmann
ed03740435 QmlDesigner.PropertyEditor: Adding missing control for TransformOrigin 
Now the TransformOrigin can be edited again.

Change-Id: Ie89c7aed2f092f303286091cc44655ff70dae777
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-15 15:12:52 +01:00
Eskil Abrahamsen Blomfeldt
e4ebad5eaf Don't overwrite deployment options for non-iOS unix-platforms 
A missing else was causing the else:unix-branch of the ios condition
to always execute for unix platforms, overwriting any of the
settings from before. Result was e.g. that Android builds would
not properly install their assets.

Change-Id: Icf8d2e77ff7eaea478cc2f945d3aee7929cc4078
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-15 14:59:41 +01:00
hjk
5ab28b2429 Debugger: Add a simple dumper for Debugger::Internal::ThreadId 
Change-Id: I09c83b1746462b688d9c8328987ee23c0a09be7e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-15 14:10:36 +01:00
Eike Ziller
0d724e40a0 LLDB: application always got at least one argument passed 
Even if it was an empty argument.

Change-Id: I610c4cea82bdbc557e63acd1663040ca70a5d3ee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-15 11:39:49 +01:00
Eike Ziller
4538ccb46c Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
 2013-11-15 10:26:57 +01:00
Tobias Hunger
d8c51d9a2a QmlPuppet: Fix build failure for Qt with versions >=5.0 and <=5.2 
QQmlType::isComposite and QQmlType::sourceUrl are both unavailable
when used in objectnodeinstance.cpp

Change-Id: I21f66b00348c0535b4779206bd63e363f4b2c225
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-14 13:12:59 +01:00
Friedemann Kleint
267ffecb4b Translations: Recover translations from "Plain application" wizards. 
Change-Id: If10d13a6ce540901def95d9a1cb7c5cb8ac911eb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-11-14 09:27:04 +01:00
Tobias Hunger
c8c49668fc Debugger: Use proper placeholders in printf 
Change-Id: Ibf63c0be68e83a870a0cb3ddce0b38381a1e4153
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-13 16:14:48 +01:00
Tobias Hunger
82f30716d8 QmlDesigner: fix compare operator in DebugOutputCommand 
Change-Id: I69d495cd61585123df99631d92f6c26b114d49b7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-11-13 16:10:48 +01:00
Marco Bubke
b35e8fbf83 QmlDesigner: fix compiler warning GraphicsObjectNodeInstance 
Change-Id: I7204914803c4937a050afce2f43232c4b8d67e49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-13 15:33:31 +01:00
Kai Koehne
3b1b5010c0 Make QtQuick project descriptions translator friendly 
Apparently using quotes in the xml file isn't supported ...
This fixes a regression introduced in b863bd02cd.

Change-Id: I166babcd8769d818a7ab488e3dbad432d8b65128
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-13 15:19:58 +01:00
Marco Bubke
c9731152ac QmlDesigner: fix compare operator for the TokenCommand 
Change-Id: I17ef1a06e94a5a89ffbe3f03103a473b803902f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-13 14:37:47 +01:00
Kai Koehne
b863bd02cd Simplify descriptions of Qt Quick wizards. 
The current template mechanism does not support descriptions with
multiple paragraphs. Work around this by making the descriptions
shorter.

Change-Id: I3980778ce3b022430cc838f2c200f003dae0081c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-13 14:05:44 +01:00
Fawzi Mohamed
82cc00bfcd templates: fix deployment for ios 
Task-number: QTCREATORBUG-10683
Change-Id: I1a7d721430b4a5bd15422d161f58a4247da79e08
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-11-13 11:44:39 +01:00
Jarek Kobus
e654f8cd8f Fix a typo in translations.pro 
Change-Id: I334372a8113e517e63710ff41fad173b08fffeb9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-11-13 11:20:32 +01:00
hjk
e5a65d58bf Debugger: Handle startup problems more gracefully 
Task-number: QTCREATORBUG-10598
Change-Id: Ia22b46da87b43c807acc11747294609d88c0e183
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-11 16:18:15 +01:00
hjk
976e849740 Debugger: Fix report of current thread from LLDB 
Task-number: QTCREATORBUG-10730
Change-Id: Iab7b46da87b43c807acc11747294609d88c0e183
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-11 15:32:13 +01:00
jkobus
c31b03f1d0 Restructure qtquick templates, read them dynamically 
Change-Id: I11dfac8ce8d6b1e68df0151516cdc03247fffe3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-11 15:27:35 +01:00
Martin Bohacek
c4648e9797 Debugger: Python dumper support for QNX targets on arm/x86. 
gdbbridge.py + dumper.py:
    added detection on QNX target and ARM arch
    added detection of Qt 3 support
    fixed detection of Qt version

qttypes.py:
    fixes of different memory alignment

stdtypes.py:
    support of different libstdc++ internal structures on QNX

Change-Id: I808ee048c66c73c38bf5a8403e9cf881e767442e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-11 10:53:07 +01:00
hjk
d7b8b291a9 Debugger: Handle tooltip data in LLDB backend 
Task-number: QTCREATORBUG-10690
Change-Id: I5deecfed4c525fd6c3cd75f510e7662e469f99ea
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-08 17:18:46 +01:00
hjk
ab388457e6 Debugger: Restrict LLDB register reporting by view visibility 
Change-Id: Iaf92f565f9b33f5739bb3e0a19920f160c0b44f7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-08 17:18:24 +01:00
Thomas Hartmann
08dd82d8ad QmlDesigner.PropertyEditor: fixing SpinBox style 
Change-Id: I309ccf0a74744174fd5b6fa0a2a2f1c1ae17c75e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-08 17:17:02 +01:00
Thomas Hartmann
3717d913e1 QmlDesigner.PropertyEditor: fix label 
Change-Id: Ibf92f565f9b33f5739bb3e0a19920f160c0b44f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-08 16:26:54 +01:00
Thomas Hartmann
85a8af7b16 QmlDesigner.PropertyEditor: Bringing back checkbox for TR 
Change-Id: I350b8d8fa6c59a48d4a89935ed40c8cff028beaf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-08 16:26:44 +01:00
Thomas Hartmann
2436bc0b2c QmlDesigner.PropertyEditor: avoid setting saturation to 0 
Block while changing hsl values.

Task-number: QTCREATORBUG-10709
Change-Id: I13a0e873c47ce7d2ea69ab42862c95ade395b7f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-08 15:46:18 +01:00
hjk
0253359e2e Debugger: Fix internal breakpoint dumper for LLDB 
Change-Id: I5406230ddeb56ac62c0bc6992379b4b89d21ba2c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-08 12:21:44 +01:00
hjk
fea08ef453 Debugger: Catch empty names for LLDB values 
Right now its unclear under which circumstances this can
happen, but we should better not abort debugging in such
cases.

Change-Id: Icc3faf304869e6fe13344137c91b0f046edc4a6a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-07 18:15:01 +01:00
Marco Bubke
0071c80a93 QmlDesigner: Fix non updating of scene matrix if parent transform changed 
Task-number: QTCREATORBUG-10644
Change-Id: Ib112352e539fde4eefb8c029080c688bed8a0ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-07 16:35:11 +01:00
hjk
8562dc0904 Debugger: Simplify pointer arithmetic in LLDB dumper 
Change-Id: I1b8396014256afc3845ccdae6e740bbf6059bbf3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-07 14:51:08 +01:00
hjk
5be208bc03 Debugger: Move more common GDB and LLDB dumper code to base 
Change-Id: I798396014256afc3845ccdae6e740bbf6059bbf3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-07 14:46:10 +01:00
hjk
cc80da536d Debugger: Move basic C-style array handling to dumper base class 
Just cosmetics. Function was oddly named, in an odd place.

Change-Id: I8bfb33f7f41f01309f4b2be8a802d4093ae25e41
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-07 14:46:01 +01:00
hjk
a9db8d9318 Debugger: Consolidate pointer display 
Pretty much the same code for GDB and LLDB, no reason to duplicate.

Change-Id: I4df4ba55e3b6bdfb6422179050f9a31bd1ebe082
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-11-07 11:11:58 +01:00
hjk
c1cddebe8d Debugger: Always report registers with LLDB 
Change-Id: I71cfb1e01193c57e06aebeaa8defa11809e24c50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-11-06 17:11:03 +01:00
jkobus
ddd6304aa2 Restructure the qml/app/ folders, remove unused meego10 leftover 
Change-Id: Ia154a89ea393f09a2878b481274e296924f42d8e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-06 15:36:32 +01:00
hjk
57c098142c Debugger: Make stack accesses more robust in lldbbridge 
Change-Id: I13cfb1e01193c57e06aebeaa8defa11809e24c50
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-06 15:33:32 +01:00
jkobus
f6aed5c295 Remove unused template 
Looks like it's not used anymore.

Change-Id: I6a7f83b0144f6aded6391169deb797ccff24bcad
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-06 15:20:37 +01:00
hjk
6f10a1cb23 Debugger: Make Watchers work with LLDB 
Change-Id: Ie39a38c6646c3c19819e2c122d7f8be285eae09e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-06 14:25:58 +01:00
Friedemann Kleint
526037da33 Remove leading blanks from messages. 
Change-Id: I688867fcd81511f4b8c9a02cf5a36e0a32a8980d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-06 11:22:14 +01:00
Eike Ziller
fd8fee749e LLDB: Fix Qt4/QSet dumper 
Change-Id: I90d3e81653266f660c27f14093459a84873b6dd3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-06 10:32:18 +01:00
Eike Ziller
bad7b17267 LLDB: fix QHashIterator dumper for Qt4 
Change-Id: I6743839cc54f81eb17125f2449dd1df391b9a1a4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-06 10:31:45 +01:00
jkobus
62590507b1 Merge multi Qt Quick UI wizards into one 
Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-06 10:23:49 +01:00
Thomas Hartmann
f1c82581b4 QmlDesigner.PropertyEditor: some cleanup 
Change-Id: I1805474d2c0f05b4662783972e1eb77e6097bf3b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-05 14:36:33 +01:00
Thomas Hartmann
1750cdc182 QmlDesigner.PropertyEditor: using GradientModel in QML 
Change-Id: I939fe8952e12f20d4a4ca6d6a41ee578cee0f7b5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-05 13:45:57 +01:00
Thomas Hartmann
618512ac8c QmlDesigner.PropertyEditor: style HueSlider 
Change-Id: Iec7483006ca91482c7f9a6a81dc742294e78ad1f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-05 13:43:22 +01:00