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
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
dt_
8d448b7250 Generic Project Wizard: Fix Icon of root item in edit files 
Change-Id: I4d42bca662207ad9f8ee8db55d88f4618b1ccc2d
Reviewed-on: http://codereview.qt.nokia.com/697
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 12:46:19 +02:00
Christian Kamm
55b11db1f7 QmlJS: Fix error location for prototype errors. 
Change-Id: Iaeb96ff67cfc92bcddeb1b7075b7fdcbaed317c0
Reviewed-on: http://codereview.qt.nokia.com/691
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 11:32:48 +02:00
Leandro Melo
395ba9875a CodeAssist: Relax a bit premature match 
In a relatively recent commit (99fee33fd1)
premature match was setup to work only on explicit invocations. However
this has shown to be too strict. Therefore, it's now a bit relaxed (not
as much as before): If the current item ends with the typed character we
assume  this is intenional - general premature matches do not end with
identifier characters anyway.

Note: Leaving only the last character as the condition is not an option
since sometimes they are not shown in the proposal description.

This patch also lifts the text method to IAssistProposalItem since
it's reasonable the every proposal must have at least some description.

Change-Id: I2ef7de2b7f978ce7059cce50175137a03315f495
Reviewed-on: http://codereview.qt.nokia.com/675
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-24 10:23:39 +02:00
Leandro Melo
a457124c54 CodeAssist: Expand prefix only when it's a completion 
Quickfixes, for instance, should not be expanded.

Change-Id: I832ea11c5a270ee290441aca0d2c7231d0ced013
Reviewed-on: http://codereview.qt.nokia.com/674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-24 10:23:34 +02:00
Christian Kamm
42c9175d19 QmlJS: Manually fix location qmltypes. 
The new location plugin does not export some of the 1.1 types anymore.
I've manually added the missing exports.

Change-Id: I19886a40fa61ab01f21b581fee315619f98668fd
Reviewed-on: http://codereview.qt.nokia.com/689
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-06-24 10:22:05 +02:00
Christian Kandeler
70057af13b Remote Linux: Get rid of indirection when setting up deployables. 
It might have been useful at some point, but certainly isn't now.

Change-Id: Ibb5d2d1133a6022617336be78f1ff23a3d734a2f
Reviewed-on: http://codereview.qt.nokia.com/690
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 09:30:05 +02:00
Christian Kamm
4f05d53ef5 QmlJS: Add 'reset code model' action. 
Having to restart Creator should be a thing of the past.

Task-number: QTCREATORBUG-4813
Change-Id: Ide242ee299b5d34aecba4823032e27741dde4a86
Reviewed-on: http://codereview.qt.nokia.com/668
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-06-23 22:22:03 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2' 
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
 2011-06-23 19:47:50 +02:00
Oswald Buddenhagen
568985ab03 Revert "BuildstepConfigWidgets can be set expanded by default" 
This reverts commit deae00a12e for master.
 2011-06-23 19:41:05 +02:00
Oswald Buddenhagen
5fd1341be0 Revert "Qt4ProjectManager exports for RemoteCompiler" 
This reverts commit 66b415f903 for master.
 2011-06-23 19:41:05 +02:00
Oswald Buddenhagen
8766b88de6 Revert "Custom targets can set QtVersion to support id and set abis" 
This reverts commit 462278b071 for master.
 2011-06-23 19:41:05 +02:00
con
1f8de24e2c Global regexp search would eat all memory for matched empty lines. 
E.g. for '^$'. also for '.*'

Task-number: QTCREATORBUG-4443
Change-Id: Ic164361ccdf791c2d0ec3c6ec501e34c9ec3fda6
Reviewed-on: http://codereview.qt.nokia.com/681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-23 17:31:37 +02:00
Christian Kandeler
51112975ce RemoteLinux: Move current device configuration to deploy configuration. 
It used to be in the deploy steps itself, which is theoretically
more flexible, but offers no advantage in practice and also causes
a lot of hassle.

Change-Id: I0eafaf8477067fced86b7a05fd94d72a35e02bb7
Reviewed-on: http://codereview.qt.nokia.com/654
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-23 16:46:53 +02:00
Friedemann Kleint
a68aff709f Debugger[CDB]: Do not detach on shutdown in case of console. 
Do not use effectiveStartMode in shutdown.

Change-Id: Ia300f511f335de4a7d9d7c07e2080cecc91042e4
Reviewed-on: http://codereview.qt.nokia.com/680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-23 16:45:59 +02:00
con
f3e22da48c Remove some aggregation deadlocks. 
You are not allowed to add components that belong to other aggregate
(including aggregates themselves). Warn in this case instead of locking
up.

Task-number: QTCREATORBUG-4926
Change-Id: I4908fb9019efbc2fa3b7c3c57e08cc1d7f8f3e2c
Reviewed-on: http://codereview.qt.nokia.com/679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-06-23 16:28:05 +02:00
con
78fa1bb0aa Find/replace tool bar wasn't usable in very small width editors. 
E.g. in split editors with small main window. We now have line edits
with a minimum size and use a flow layout for the replace buttons (which
will reduce width when necessary by laying out vertically).

Flow layout is taken from the Qt examples.

Task-number: QTCREATORBUG-3279
Change-Id: Ic07d4d3e75e3d928d6b53534adb42481ce26256b
Reviewed-on: http://codereview.qt.nokia.com/666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-06-23 16:26:30 +02:00
Christiaan Janssen
fbce58bf8c QmlProfiler: Callers and Callees separate views 
Change-Id: Ifa3939eeda2a473722cbd8dfac33794a15d8c453
Reviewed-on: http://codereview.qt.nokia.com/678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-23 16:25:25 +02:00
Christian Kandeler
878429ad24 Remote Linux: Fix possible crash. 
Change-Id: I1519117381dbeb22d40546ecf8467079ca85aa35
Reviewed-on: http://codereview.qt.nokia.com/677
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-23 16:22:10 +02:00
Christian Kandeler
a529a804e0 Harmattan: Create empty Aegis manifest file on target creation. 
This way, the developer gets a hint about what to edit when
it becomes necessary to manually set capabilities.

Change-Id: I03ef476b87cba26fd15d1bc28ba652d4114578b6
Reviewed-on: http://codereview.qt.nokia.com/676
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-23 16:15:44 +02:00
Christiaan Janssen
13cb0b6df3 QmlProfiler: Dependencies view 
Change-Id: I1172d66b8e577994df787e2bb14cdd03a2affb35
Reviewed-on: http://codereview.qt.nokia.com/613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-23 15:23:36 +02:00
Christian Kamm
99c38dde86 Qt4Project: Reset QML import paths in ProjectInfo. 
Previously, import paths would accumulate.

Change-Id: I2f6f12abde7906fc823323e4470af7a19afa304e
Reviewed-on: http://codereview.qt.nokia.com/667
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-23 15:13:25 +02:00
Kai Koehne
31904563bb QtQuickApp wizard: Add option for QtQuick 1.1 module 
Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-23 14:36:52 +02:00
Christian Kamm
4bf5f4bd94 QmlJS: Respect the REVISION property for methods and properties. 
Task-number: QTCREATORBUG-3907
Change-Id: Ic2c1f8cafe381e5216ae7ad73502ca0fae20dda0
Reviewed-on: http://codereview.qt.nokia.com/656
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-06-23 13:39:08 +02:00
Christian Kandeler
3735f3c48a RemoteLinux: Fix possible crash. 
We cannot assume that a deploy configuration is present.

Change-Id: I396f630d2ad01f2b17d65c41ad4b2ec587b7e48d
Reviewed-on: http://codereview.qt.nokia.com/653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-23 12:35:01 +02:00
hjk
3de50895eb debugger: update our gdb patches 
Change-Id: I1c81b28ab22ec11dcef1f58030b5906f4fc6323c
Reviewed-on: http://codereview.qt.nokia.com/652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-23 12:31:30 +02:00
hjk
786de8a7e6 debugger: correct comment in dumper.py 
Change-Id: Ic1d33180515ad79c4233b013ec7d3530674d5117
Reviewed-on: http://codereview.qt.nokia.com/651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-23 12:31:17 +02:00