feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,733 Commits 108 Branches 368 Tags
b7e72a5cd8bf09875477fdfee9dc34cfaa7a47cc
Commit Graph

19733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christiaan Janssen
0c0dbcc52c QmlProfiler: minor improvements in rangedetails display 
Change-Id: I7a4c85443d99425f5b15eda424745b83526ebb3f
Reviewed-on: http://codereview.qt.nokia.com/754
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-27 12:55:07 +02:00
Christiaan Janssen
9baa4f51a1 QmlProfiler: Clear button in toolbar 
Change-Id: Id9739b7828b080b016aa41b13b4f5313a2319172
Reviewed-on: http://codereview.qt.nokia.com/750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-27 12:54:54 +02:00
Leena Miettinen
843db69441 Git: Document remote and branch dialogs 
Change-Id: I8b244b68ea6bca5118f5be8c1116d6eeec3e49bd
Reviewed-on: http://codereview.qt.nokia.com/761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-27 12:35:47 +02:00
Christian Kamm
14a74f336a qmldump: Fix export comparison. 
Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Change-Id: I0d04d826c72d4aed5d70c3c65a1f97ad5872827c
Reviewed-on: http://codereview.qt.nokia.com/759
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-27 11:41:38 +02:00
Christian Kamm
f229def962 Fix UiPublicMember::lastSourceLocation. 
Mirrors http://codereview.qt.nokia.com/#change,755

Change-Id: I7d1222bda67344456710ada52af33d17688627ca
Reviewed-on: http://codereview.qt.nokia.com/757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-06-27 10:45:51 +02:00
Christian Kandeler
0119dade1a RemoteLinux: Rename some classes and the associated files. 
Also make them external.

Change-Id: I21a74c1f7124646b5507ffd2ee0e24c7c60eca97
Reviewed-on: http://codereview.qt.nokia.com/749
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-27 10:45:30 +02:00
Friedemann Kleint
90ee1cc1c9 Debugger: Add infrastructure for message tracepoints. 
Add context menu to add a 'message tracepoint', that is,
a trace point that outputs a user message and continues.
Intended to be a replacement for manually inserting
a qDebug() into the code to understand the call sequence.
Yet to be implemented for gdb.

Change-Id: I1c303001421fbbae74d98d15d52718579350db6e
Rubber-stamped-by: hjk
Reviewed-on: http://codereview.qt.nokia.com/756
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-27 10:42:50 +02:00
Leena Miettinen
bcb46f3ebb Doc: Analyze mode and QML profiler 
Change-Id: I8edbcfc43caf312da05248c86ca6ad41733e941b
Reviewed-on: http://codereview.qt.nokia.com/731
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-27 09:22:35 +02:00
hjk
377668a0cf debugger: move updateMarker from BreakHandler to BreakpointItem 
Change-Id: Ie3bafc8fc23cc95e0795d57dac956b3345e671dd
Reviewed-on: http://codereview.qt.nokia.com/748
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-27 09:21:30 +02:00
hjk
e41f11298b debugger: workaround for not-updated markers 
Change-Id: Ic0bb344a117496dbada0ccef181a08f5b5bbbb8c
Reviewed-on: http://codereview.qt.nokia.com/747
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-27 09:14:51 +02:00
hjk
16fe673479 debugger: improve handling of subbreakpoints in gdb 7.2 and earlier 
Change-Id: I6cd4c2a07544ea902798e2e4596bd56e634f15e3
Reviewed-on: http://codereview.qt.nokia.com/746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-27 09:14:37 +02:00
hjk
c041286753 debugger: split BreakpointIndex into plugin and debugger specific part 
Change-Id: I21d10cf42eb039c74475e106537b6e107d155196
Reviewed-on: http://codereview.qt.nokia.com/745
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-27 09:14:25 +02:00
hjk
c4713f5ab2 debugger: handle results of manual break commands 
Change-Id: I0ab8ad3ef3ddfe7c8d69fd163864875190698475
Reviewed-on: http://codereview.qt.nokia.com/744
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-27 09:12:12 +02:00
Christian Kandeler
d17d0cb6e9 RemoteLinux: Fix widget appearance. 
Change-Id: I8c6a125d07192c7ffea8c1b6c91b860299d1c33f
Reviewed-on: http://codereview.qt.nokia.com/737
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 18:28:57 +02:00
Christian Kandeler
c1a4f2c3dc Harmattan: Change display name for device type. 
Change-Id: Ifd3e504d39b2d20c72e5d551db45c33ccd82372d
Reviewed-on: http://codereview.qt.nokia.com/736
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 18:28:39 +02:00
Tobias Hunger
b5419251c7 Build fix 
Change-Id: I6c03d613c0dcda92ef411265e1d3d1ff679ee0a8
Reviewed-on: http://codereview.qt.nokia.com/735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-24 17:36:44 +02:00
Thomas Hartmann
c4eae3adbc QmlDesigner.propertyEditor: adding checkbox_tr.css 
Change-Id: I10094f4cd4dae6fa3af0ea3497cbb9ed74c777f1
Reviewed-on: http://codereview.qt.nokia.com/734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 17:33:36 +02:00
Tobias Hunger
4a0fcf6b12 Abi: Update to use creator-test-data repo for the abi test data 
Change-Id: Ie5ce3dd0d821516355bd43748f180e3323bb5879
Reviewed-on: http://codereview.qt.nokia.com/696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-24 17:15:15 +02:00
Thomas Hartmann
6e778df219 QmlDesigner.QtQuickPlugin: update for views 
ListView/GridView and PathView are now populated with code

Change-Id: I66356be4f4c49c11177e6aefca3f013aa0d5937c
Reviewed-on: http://codereview.qt.nokia.com/717
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:40:04 +02:00
Thomas Hartmann
6b8ffcfca8 QmlDesigner.model: allow creating items from qml code in library 
Change-Id: I2fe7cbe594b6aac6cbf01f283a0ed0f2aec753a8
Reviewed-on: http://codereview.qt.nokia.com/720
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:36:42 +02:00
Thomas Hartmann
fa97907bb1 QmlDesigner.symbianPlugin: update 
Change-Id: I7f4d5084264e4b810b3ab95fcbb51f9c9eb971f1
Reviewed-on: http://codereview.qt.nokia.com/724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:31:41 +02:00
Thomas Hartmann
59ab229b84 QmlDesigner.documentController: switching to master model on mode change 
Change-Id: If40ad93083d36eddf2090d50f2944ff7a3f77539
Reviewed-on: http://codereview.qt.nokia.com/727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:27:20 +02:00
Thomas Hartmann
ad80aa20ae QmlDesigner.itemLibraryInfo: add qml property for library 
Change-Id: I986cef3a15d6332f1dcf7c0ca4cd035cc0751e76
Reviewed-on: http://codereview.qt.nokia.com/719
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:23:03 +02:00
Thomas Hartmann
8102f3f6d2 QmlDesigner.componentView: fix for captions 
Change-Id: I0ea2441d2989b8e395955b5e19ad45d341d12379
Reviewed-on: http://codereview.qt.nokia.com/716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:22:49 +02:00
Thomas Hartmann
05de65756d QmlDesigner.documentController: cleanup 
Change-Id: Ia784d21934baa83c9d8527b46b31a48be6324d2a
Reviewed-on: http://codereview.qt.nokia.com/725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:22:27 +02:00
Thomas Hartmann
f6a2e0ad77 QmlDesigner.designDocumentController: reset formeditor 
We are reseting now the formeditor when switching the mode.

Change-Id: Ic9d16e7587e59124dab51cd512bd6a366156c622
Reviewed-on: http://codereview.qt.nokia.com/726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:21:23 +02:00
Thomas Hartmann
f0cac988f0 QmlDesigner.model: add resetView() to AbstractView 
Change-Id: I36b14447f901ae97d24a92ce4ba0510e36177611
Reviewed-on: http://codereview.qt.nokia.com/722
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:20:56 +02:00
Thomas Hartmann
b7cbc967cd QmlDesigner.rewriter: improve debugging 
Change-Id: I62c6ba8a95ec0bdbf99b5422c5f00235d85167e3
Reviewed-on: http://codereview.qt.nokia.com/721
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:20:33 +02:00
Thomas Hartmann
26058a57b9 QmlDesigner.modelMerger: fix 
The properties nodeSource and nodeSourceType also have to be copied.

Change-Id: Id583399f7e597bd03c4ad51625e88f278499555e
Reviewed-on: http://codereview.qt.nokia.com/718
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:19:36 +02:00
Thomas Hartmann
cf39ee315b QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails 
Change-Id: I7dfecd8e0ad0016748ef4513cf0364e8dcd7d121
Reviewed-on: http://codereview.qt.nokia.com/715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:19:01 +02:00
Thomas Hartmann
ab306fa37a QmlDesigner.rewriter: crash fix 
This fixes a bug for UiObjectBindings.
This just did not handle the binding case properly.

Change-Id: I543a1d839d5960044b5a5a39f506af753a70c287
Reviewed-on: http://codereview.qt.nokia.com/723
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:18:35 +02:00
Pawel Polanski
5762faa648 Remove compilator's warning 
Change-Id: I3e08eec23ae6c825f056218840d7534b66037046
Reviewed-on: http://codereview.qt.nokia.com/714
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-24 16:15:57 +02:00
con
52b2dd1578 Better name for enum value. 
Change-Id: Ic89535081fca147727d12d77e1427d8240cde6d5
Reviewed-on: http://codereview.qt.nokia.com/713
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 16:04:34 +02:00
con
19bdd72805 Don't keep canceled tasks forever. 
They'll fade "after user interaction" now (since canceling will most
probably lead to mouse movement over the widget that already counts as
interaction, i.e. after pressing 'x' it will fade after a while).

Task-number: QTCREATORBUG-4456
Change-Id: Id095a6bbd5819b93ec8cb9f514b429ef5ab231e9
Reviewed-on: http://codereview.qt.nokia.com/712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 15:57:59 +02:00
Kai Koehne
5c9b8946ce QtQuickApp wizard: Add Qt Components for Meego/Harmattan 
Change-Id: I4809de36e4913037439ab9eb7c56021431cff365
Reviewed-on: http://codereview.qt.nokia.com/704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-24 15:50:45 +02:00
Kai Koehne
f7286529bb QtQuick Wizard: Improve wording of Components page 
Change-Id: I02a2b4ca77a631db9ebfbf949d9a79d5a820bb4a
Reviewed-on: http://codereview.qt.nokia.com/703
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-06-24 15:50:31 +02:00
Kai Koehne
cdda5c775d Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module" 
This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-24 15:36:28 +02:00
Kai Koehne
e1256f11f4 QtQuickApplication wizard: Don't show Harmattan targets for symbian components 
Change-Id: Ia5108c04d7898567ece7b5498359c88210ed2682
Reviewed-on: http://codereview.qt.nokia.com/695
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-24 15:33:33 +02:00
Christian Kandeler
efbcb3860d SSH: set correct attributes when uploading a file. 
Change-Id: I59484d5e66491e8941992abdd2a478364ec258a7
Reviewed-on: http://codereview.qt.nokia.com/710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 15:33:23 +02:00
Christian Kandeler
9d7285687e Remove unused variables. 
Change-Id: I55ba7af5f9d4f036d3562cb1e4475809e79f8b24
Reviewed-on: http://codereview.qt.nokia.com/700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 15:32:04 +02:00
Pawel Polanski
0e4af76313 CODA: API has changed 
and Creator site has to be adjusted

Change-Id: If93d56bc2ad19aae985e8e861c6030950d8d846d
Reviewed-on: http://codereview.qt.nokia.com/706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-24 15:29:31 +02:00
Pawel Polanski
44e905d08c Symbian: SIS as a format must be uppercased 
sis as an extension should be lowercased

Change-Id: I173e76005b6775fbd1180681d6b60b8a203cc04e
Reviewed-on: http://codereview.qt.nokia.com/709
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-06-24 15:03:24 +02:00
Pawel Polanski
97f4192fc8 PublishToOvi: Text fixes 
Change-Id: I49ecb07ddaae02a901c8dab0b3d691d7b1589db6
Reviewed-on: http://codereview.qt.nokia.com/708
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-06-24 15:02:14 +02:00
Kai Koehne
faa3a32d4d TargetSetupPage: Do not show targets that do not have required features 
Change-Id: I8107f1de0120f46dd428ad257f0a38ab6ebb4abc
Reviewed-on: http://codereview.qt.nokia.com/694
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 14:49:22 +02:00
Kai Koehne
e4351cd324 Qt4BaseTargetFactory: Expose list of generic 'features' for a target 
Replace the isMobileTarget, supportsShadowBuilds methods by a
generic targetFeatures method which exposes features as a set of
strings.

Change-Id: I2ac99ff5a82280316071efaa140cd7ea35b21374
Reviewed-on: http://codereview.qt.nokia.com/692
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 14:49:13 +02:00
Pawel Polanski
37a887cb06 CODA: QtQuick component version is now displayed 
in the device's information

Change-Id: I730dfdb807a41696c81c6544f22c8b8c13bd6a72
Reviewed-on: http://codereview.qt.nokia.com/707
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-24 14:21:12 +02:00
Pawel Polanski
90d86fb188 CODA: Connect the right SIGNAL-SLOT 
Change-Id: If3193baa1530526c0b26e799e9f6f57065d419a2
Reviewed-on: http://codereview.qt.nokia.com/705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-24 13:47:52 +02:00
Christian Kandeler
8e6d32324f RmoteLinux: Fix variable usage. 
Change-Id: I89dff1adde47393bd1b9f05bbe23698bcd04eab0
Reviewed-on: http://codereview.qt.nokia.com/701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 13:46:05 +02:00
Christian Kandeler
aea538bc5f Fix gcc warning. 
Change-Id: I42dee44f1cee68d83d803174f477b79131a7e109
Reviewed-on: http://codereview.qt.nokia.com/702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 13:45:33 +02:00
Pawel Polanski
fe6d57da62 Symbian: New system version descriptions added 
Change-Id: I6eaac635c27ee4dc04bedc96a3a70117bd3fd773
Reviewed-on: http://codereview.qt.nokia.com/630
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-24 13:32:38 +02:00