feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Teske
050af03876 Reset ignoreGenericOptionsPage in Qt Quick wizard 
Change-Id: I2cef1387430cd27783f9ee6cb1bea548eb58575c
Reviewed-on: http://codereview.qt.nokia.com/1325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-18 19:46:25 +02:00
Friedemann Kleint
4f741fc7c8 Analyzer[callgrind]: Fix a crash when remote profiling. 
Task-number: QTCREATORBUG-5402

Change-Id: Ifd42befddccd28abdc5ee0a701321e1a6cf58f7f
Reviewed-on: http://codereview.qt.nokia.com/1774
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-18 17:39:35 +02:00
Daniel Teske
22c0f6ae0d QmlRunControlFactory: Cleaner canRun code 
Fixed a bug where the case config->qtVersion == 0 was mishandled.

Change-Id: Ic11133bcfbe402e8f7a19b99b59161f8a913a2ab
Reviewed-on: http://codereview.qt.nokia.com/1779
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-18 17:39:07 +02:00
Thomas Hartmann
ddeef63189 QmlDesigner.propertyEditor: bugfix for assert 
Since the linedit in the property editor has an input mask,
propery names like "red" are not handled correctly.

Change-Id: I43ec2f7e42de7f57d78c97b6865ea36c4e11b3fb
Solution: We normalize "red" to "#ff0000" in the property editor.
Task-number: QTCREATORBUG-5479
Reviewed-on: http://codereview.qt.nokia.com/1749
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 17:38:56 +02:00
Leena Miettinen
72ca2a7a85 Doc: requirements for QML debugging on devices 
Task-number: QTCREATORBUG-4420
Change-Id: I0ee9bd7f3a8ce48c11fc18049ebf3b9d6e833b8c
Reviewed-on: http://codereview.qt.nokia.com/1773
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-18 17:11:47 +02:00
Thomas Hartmann
5af3f24dc8 QmlDesigner.propertyEditor: style fix 
I moved the tooltip into the parent widget to avoid coloring issues.

Task-number: QTCREATORBUG-5480
Change-Id: Ic7f70d83e22847ca8f257be3728139f68a0cb77c
Reviewed-on: http://codereview.qt.nokia.com/1776
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 16:35:02 +02:00
Thomas Hartmann
238efaf3f7 QmlDesigner: updating symbian plugin 
Nice support for ToolBar and a symbian style ListView

Change-Id: I14b2ce7dd33fa363d6e2c498d83dda362e03169a
Reviewed-on: http://codereview.qt.nokia.com/1756
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 15:45:34 +02:00
Friedemann Kleint
a83d463fa5 Debugger[CDB]: Make Qt 5's QString/QByteArray editable. 
Introduce struct & routine to return address data for QStrings/
QByteArray of versions 4,5 and use that.

Change-Id: I0603d160561bd28ef13bf79739b44b8af439bd93
Reviewed-on: http://codereview.qt.nokia.com/1770
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-18 15:13:56 +02:00
Christiaan Janssen
b3a6489752 QmlProfiler: enabled sorting in Callers/Callees tabs 
Change-Id: Ieede8580df9f9e7384865aaa9944a29925008fb1
Reviewed-on: http://codereview.qt.nokia.com/1758
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-18 14:46:26 +02:00
Christiaan Janssen
f054d0dc8f QmlProfiler: fixed sorting of percentage column 
Change-Id: Ic76135e2e401ee028a986f1f57186cb2144ed40a
Reviewed-on: http://codereview.qt.nokia.com/1755
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-18 14:24:27 +02:00
Christian Kandeler
2b59fceeea Remote Linux: Fix compilation. 
Change-Id: I41409947cf2f67eb0800c55a0e213e6f04587b03
Reviewed-on: http://codereview.qt.nokia.com/1754
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
 2011-07-18 14:13:34 +02:00
Christian Kandeler
5705cd99db MeeGo: Use recommended package manager icon size. 
Task-number: QTCREATORBUG-5487

Change-Id: Ic0a25dcc26d835d1bddf267c0cfc50486e8eb878
Reviewed-on: http://codereview.qt.nokia.com/1752
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-18 14:03:06 +02:00
Thomas Hartmann
d1bbdf5f73 QmlDesigner.propertyEditor: ui fix 
Change-Id: I0abb528c124355808502848d5db3ec01dc3d6636
Reviewed-on: http://codereview.qt.nokia.com/1748
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 13:20:09 +02:00
Thomas Hartmann
95bf007e2b remove qDebug 
Change-Id: Ia83708b48f7565d8d272a797c7e18cb0931dddb0
Reviewed-on: http://codereview.qt.nokia.com/1747
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 13:19:59 +02:00
Friedemann Kleint
1555e62c62 Debugger[gdb]: Dump QString and QByteArray of Qt 5. 
Introduce functions to extract address and size of the
data from QString/QByteArray depending on the version
of Qt used.

Change-Id: I65a9c7ee05da7f8fe65f5916ccf699181782f8de
Reviewed-on: http://codereview.qt.nokia.com/1745
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-18 12:53:01 +02:00
Thomas Hartmann
c0eaaeffb7 QmlDesigner.propertyEditor: increasing minimum width 
Task-number: QTCREATORBUG-5491
Change-Id: I1f3d0c553537d51042dc0b00e5d4de882c27a07e
Reviewed-on: http://codereview.qt.nokia.com/1740
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 11:20:39 +02:00
Thomas Hartmann
7e19582af4 QmlDesigner.propertyEditor: adding tooltips 
Task-number: QTCREATORBUG-5480
Change-Id: Ia33cb40f0d34eb8c29f6c490051a373820a7ebc3
Reviewed-on: http://codereview.qt.nokia.com/1739
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 11:02:28 +02:00
Eike Ziller
6f30393a50 Version bump. 
Change-Id: I39e5fae3a357212afdede4a7ec53067f29d6348b
 2011-07-18 08:58:12 +02:00
Thomas Hartmann
d853997f99 QmlDesigner.dragAndDrop: crash fix 
This fixes a crash if we drag in complex items with children.

Change-Id: I0e924d3130cbd43dc9a20469576dce8a0f67f3df
Reviewed-on: http://codereview.qt.nokia.com/1715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 18:33:13 +02:00
Oswald Buddenhagen
7cd17f3f41 fix access to free()d memory 
the 'item' reference may become invalid inside the loop.

Change-Id: I4468b1dc67e565e2eb8ce35268ef44b18142846a
Reviewed-on: http://codereview.qt.nokia.com/1703
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-07-15 17:48:35 +02:00
Friedemann Kleint
8a28b3c01c Debugger[CDB]: Dump Qt5's new QString, QByteArray classes. 
Task-number: QTCREATORBUG-5475

Change-Id: Iee10910e55df8b8308711818da2847b09a52fe92
Reviewed-on: http://codereview.qt.nokia.com/1711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-15 17:14:55 +02:00
Christian Kandeler
076064ce30 RemoteLinux: Introduce abstract packaging step. 
This removes the dependency of the tar packaging step on Maemo-specific code.

Change-Id: I863b13e643a5028edaf2f571f63b1a52d229812b
Reviewed-on: http://codereview.qt.nokia.com/1709
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-15 17:06:29 +02:00
Thomas Hartmann
57655e3e0d QmlDesigner.rewriter: adding use of ModelManager to NotIndentingTextEditModifier 
This fixes bugs in the copy and paste code.
Before we used an invalid snapshot and empty import paths and could
not resolve library imports properly.

Change-Id: I53df67bbba2b5abc73065b5729d0957e908cc874
Reviewed-on: http://codereview.qt.nokia.com/1708
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 16:49:08 +02:00
Thomas Hartmann
a826ee722e QmlDesigner: fix in model for meta info 
We have to use metaInfoProxyModel() to allow forwarding.

Since property.parentModelNode().model() might be null in
propertyIsComponentType().

I also provide a fix for this. Before calling ->metaInfo on a 0 model was
safe, since metaInfo is non virtual and the constructor and isSubCLassOf()
were safe and had checks.
This was still wrong of course.

Change-Id: If4a2371e4dceeccba7f3ddde7236a7240ed7b92a
Reviewed-on: http://codereview.qt.nokia.com/1707
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 16:48:45 +02:00
Thomas Hartmann
ad238ed315 QmlDesigner: crash fix 
If the root node is invalid currentState is also invalid.

Change-Id: Icf47c9295cdf82bf7b36328e76dbb1a974ee43f9
Reviewed-on: http://codereview.qt.nokia.com/1706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 16:48:20 +02:00
Thomas Hartmann
0173ecbc5e QmlDesigner.navigator: fix missing <cpp> 
This enables front and back for flipable.
I also fixed isSubclassOf() for empty strings.

Change-Id: Id807d10339813df7c0412ceeaa5877264267f2e1
Reviewed-on: http://codereview.qt.nokia.com/1705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 16:47:56 +02:00
Leandro Melo
89ac110ab0 C++: Relax parsing for templateid in some cases 
The correct parsing for certain templateids would require name
lookup. In order to avoid erroneous syntax errors detection (like
the one below ) we block the notification for such cases.

bool r = a < b ? c > d : false;

Task-number: QTCREATORBUG-5122
Change-Id: I9eb9ee89cd21bec3ed924982957f50f9346f90be
Reviewed-on: http://codereview.qt.nokia.com/1704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-07-15 16:31:03 +02:00
Leena Miettinen
f2d01e1007 Doc: meaning of blue color in the property editor 
Explain how the changes in property values are vizualized
in the Qt Quick Designer Properties pane.

Task-number: QTCREATORBUG-5047
Change-Id: Ib7c2334dfee6295ec54761d2b1d81fc7309ca7c8
Reviewed-on: http://codereview.qt.nokia.com/1701
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 14:42:14 +02:00
Eike Ziller
f87137a703 Merge branch 'master' of ssh://codereview.qt.nokia.com/qt-creator/qt-creator 2011-07-15 14:29:25 +02:00
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
 2011-07-15 14:29:07 +02:00
Friedemann Kleint
379f03b8bd ProjectExplorer: Add 'Collapse All' to tree widget. 
Which is handy when dealing with multiple projects.

Use a global action and reconnect.

Change-Id: I101275ffe09515a9598791e8a4fa610661ecaa04
Reviewed-on: http://codereview.qt.nokia.com/1577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-15 13:57:50 +02:00
Christian Kandeler
ab8713d792 RemoteLinux: Fix crash in deploy config factory. 
Change-Id: Ie4742619ae4b1138ba59dfe9ac9162a992cdfc18
Reviewed-on: http://codereview.qt.nokia.com/1697
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-07-15 11:48:26 +02:00
Christian Kamm
eda93bde42 QmlJS: Fix type lookup issue. 
0c0ffab1bb accidentally always returned
null if the type was not an enum.

Change-Id: Ie16d96e59cefa50c345cddb4a053fd8b60ba3cd6
Reviewed-on: http://codereview.qt.nokia.com/1693
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-07-15 11:22:20 +02:00
hjk
5e410ae6cf debugger, bookmarks: use char[] for string constants 
Change-Id: I2ef319e4556da1b93ae82afd597e0445d1f81d8d
Reviewed-on: http://codereview.qt.nokia.com/1692
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-15 11:01:52 +02:00
hjk
dbc0fa0919 analyzer: cleanup string constant usage 
Change-Id: I9fcff37c06f98d0010dccfdece567dae7b0264bd
Reviewed-on: http://codereview.qt.nokia.com/1691
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-15 11:00:56 +02:00
hjk
8e3c9c0670 debugger: work on manual tests 
Change-Id: I5f74c5fc2746e4195bdd5af405cb06cf8997cf6b
Reviewed-on: http://codereview.qt.nokia.com/1690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-15 11:00:30 +02:00
Marco Bubke
8f826aa5f7 QmlDesigner.NodeInstances: Add workaround for simulator Qt 
Task-number: QTCREATORBUG-5408

Change-Id: I7abcc36102421d07dfc044355ff70833bf93d84b
Reviewed-on: http://codereview.qt.nokia.com/1678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 10:45:10 +02:00
Leena Miettinen
5a9ec44fb4 Doc: changes to Valgrind options 
Change-Id: I2b0ab7566582e657225846ee4a3bfc54d9408b57
Reviewed-on: http://codereview.qt.nokia.com/1689
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-15 10:38:34 +02:00
Thomas Hartmann
b8494fa6b2 QmlDesigner: fix for states 
stateChanged() was never called.

cleanup:
I removed stateChanged() and use actualStateChanged()

Change-Id: I11a73b21dca5083147223f6e4f23da4c7305263c
Reviewed-on: http://codereview.qt.nokia.com/1677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-15 09:49:46 +02:00
Christian Kandeler
bb5c7366f5 RemoteLinux: Factor out generic deploy step factory. 
Change-Id: I66d09f0e14a604429852c6cd72003f31ce5c7eb5
Reviewed-on: http://codereview.qt.nokia.com/1676
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-14 17:46:45 +02:00
hjk
abc60352fd analyzer: hide Browse button for valgrind path chooser on Windows 
Change-Id: If7bf02f5ab52f3f3330a8eea0669f619130bbe2f
Task-number: QTCREATORBUG-5441
Reviewed-on: http://codereview.qt.nokia.com/1658
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-07-14 17:43:20 +02:00
hjk
51d83e4ce6 classview: adjust to d-pointer style rules 
Change-Id: Ie413a7336ef4bde5dcf1b43b6832167742608a83
Reviewed-on: http://codereview.qt.nokia.com/1296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 17:43:03 +02:00
hjk
5515b27af6 fakevim: fix <n>r<Return> 
Was reported on the feedback form.

Change-Id: Iab2517f4bd29bbad211eced7c268f93d928bb5aa
Reviewed-on: http://codereview.qt.nokia.com/1657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 17:42:53 +02:00
Thomas Hartmann
3c9fa90eaf QmlDesigner.propertyEditor: fixes editor for ListView 
Fixing typos and names.

Task-number: QTCREATORBUG-5450
Change-Id: Ia38d93e6cb45a2fe8a0de152c4f8686bf3cb74c4
Reviewed-on: http://codereview.qt.nokia.com/1674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 17:17:33 +02:00
Marco Bubke
8a5fffb945 QmlDesigner.NodeInstances: Fix restore bindings for reset 
Task-number: QTCREATORBUG-5415

Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 16:53:08 +02:00
Marco Bubke
7ec3a259f4 QmlDesigner.PropertyEditor: Remove wrong properties 
Task-number: QTCREATORBUG-5449

Change-Id: I22c69f33eb69fc7e331c659e5fc0ffd44f616e7f
Reviewed-on: http://codereview.qt.nokia.com/1670
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 16:41:40 +02:00
Christian Kandeler
2bdc5c79c6 RemoteLinux: Separate generic and MADDE-specific deploy configurations. 
Change-Id: If06ee9fbf91a50bcb6c7b79a824f3f74f92b98d2
Reviewed-on: http://codereview.qt.nokia.com/1671
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-14 15:47:35 +02:00
Thomas Hartmann
44886dcde1 compile fix 
Change-Id: I2c720a42c63856b62d14fc01239a2c12110328be
Reviewed-on: http://codereview.qt.nokia.com/1665
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-07-14 14:43:42 +02:00
Thomas Hartmann
80909210b1 QmlDesigner.instances: ignore infinite/huge bounding rects 
There are cases with infinite/huge bounding rects. We ignore those.

Change-Id: If9a55bef91ab5aec4736c579131f4edf10768469
Reviewed-on: http://codereview.qt.nokia.com/1660
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 14:35:51 +02:00
Thomas Hartmann
d53f595879 QmlDesigner.instances: clean import paths from .1.0 
Plugin directories might contain the version number,
but they do not have to.

We try to map .1.0 to "" for components delivered with Creator.

Change-Id: Ie785cf29d4dd64a504501d2be501fd6aa733973b
Reviewed-on: http://codereview.qt.nokia.com/1659
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 14:35:39 +02:00