feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,408 Commits 108 Branches 368 Tags
ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6
Commit Graph

2336 Commits

Author SHA1 Message Date
Daniel Molkentin
609354ae47 WelcomeScreen: remove debug output 
Change-Id: Ie1dc4be339c23d0a50c71e131e264ca5eda8e63a
Reviewed-on: http://codereview.qt.nokia.com/959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-30 17:38:17 +02:00
Thomas Hartmann
3cfa376243 QmlDesigner: Fix wrong position for reparenting 
Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c
DoneBy: Marco Bubke
Task-number: QTCREATORBUG-3962
Reviewed-on: http://codereview.qt.nokia.com/958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:36:09 +02:00
Daniel Molkentin
b18ef1ffb2 WelcomeScreen: fix components imports on Windows 
The path-based loader in QML is broken there.

Change-Id: I390370ca098e288f6e241c526e068a70f17d676f
Reviewed-on: http://codereview.qt.nokia.com/947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-30 17:24:49 +02:00
Daniel Molkentin
eb42871890 Desktop Components: Cleanup imports 
Change-Id: I7fca7c68106240c5cc221a5f1c1e85eee1b01c01
Reviewed-on: http://codereview.qt.nokia.com/946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-30 17:24:44 +02:00
con
3c1c82ea85 Center the heading on welcome page. 
Change-Id: I6713eb330ab4eb6bcbb8b5b897b250b22bca3c20
Reviewed-on: http://codereview.qt.nokia.com/898
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-30 17:09:19 +02:00
con
39f1e4f2db Show news from the start and cycle through them. 
Change-Id: I0f783148ea3e42ac4f9728a0f32c0452c041b387
Reviewed-on: http://codereview.qt.nokia.com/942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-30 12:04:51 +02:00
Marco Bubke
a49b85eac5 QmlDesigner.NodeInstances: Return the implicit size if the size is invalid 
Task-number: QTCREATORBUG-5240

Change-Id: Ie8be3a2cc728805411a79c1f216ede566c641c17
Reviewed-on: http://codereview.qt.nokia.com/925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:22 +02:00
Marco Bubke
bc6879cbc8 QmlDesigner.NodeInstances: Positioners are resizable again 
Task-number: QTCREATORBUG-5242

Change-Id: I6f481dc4e9705e0ebdc8f30761afc0c4fc7f2849
Reviewed-on: http://codereview.qt.nokia.com/915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:00 +02:00
Daniel Molkentin
5e2f3f0d5e QML l10n fixes 
- qsTr(): don't use + for visible strings.
- add welcomescreen to translation.pro

Change-Id: I361ef4a74bd0098cd7a7ee6b596b2b281661d50b
Reviewed-on: http://codereview.qt.nokia.com/920
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-30 10:20:40 +02:00
Robert Loehning
3f70190965 Improved German translation for removing git remotes 
Change-Id: I98aac31e0235e3f1f3c50eae2f9990f2a3d1ace5
Reviewed-on: http://codereview.qt.nokia.com/924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-29 20:08:07 +02:00
Daniel Molkentin
43b2b5c962 WelcomeScreen: remove obsolete stub file 
Change-Id: Ie3ddcfa3a5b96bed9023d8b4cbbe567d465ee57d
Reviewed-on: http://codereview.qt.nokia.com/919
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-29 18:06:29 +02:00
Daniel Molkentin
17c8833c05 WelcomeScreen: Pointing cursor for News 
Change-Id: Ib327f70354296f5237e4783502329e64e02b53cd
Reviewed-on: http://codereview.qt.nokia.com/890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 17:53:45 +02:00
Daniel Molkentin
0627498500 WelcomeScreen: Remove debug output 
Change-Id: I4d1d84be5f6a51ecfdc332e388db013d1a7080ef
Reviewed-on: http://codereview.qt.nokia.com/907
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-29 17:13:10 +02:00
Daniel Molkentin
0cd1e2e331 Welcome Screen: Fix crash with tooltips in Desktop Components. 
Task-Number: QTCREATORBUG-5252
Change-Id: I8d42b2c31491f220b816a2c0d5b97e67372ad2ad
Reviewed-on: http://codereview.qt.nokia.com/906
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-29 17:13:04 +02:00
Thomas Hartmann
16975727b8 QmlDesigner.qmlPuppet: SetErrorMode only if breakpad is disabled 
Change-Id: Ibe0ded2855dc0fe63f0867d953f501c8a025210b
Reviewed-on: http://codereview.qt.nokia.com/912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-29 17:09:23 +02:00
Marco Bubke
f7f85b797e QmlDesigner: Fix root item is resizable and movalbe 
Change-Id: I3e9e8d0ecd89040b01bcfabc8d6567411567e7e2
Reviewed-on: http://codereview.qt.nokia.com/910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 16:32:40 +02:00
Daniel Molkentin
8f9c409caf WelcomeScreen: qml fixes 
Change-Id: I1c9769b419f426c4025081c95887d318b386aac9
Reviewed-on: http://codereview.qt.nokia.com/891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 15:23:11 +02:00
Christian Kamm
2c40acbec9 qmldump: Fix dumping with -path on Mac. 
If the current working directory was a direct parent of the qmldir path
the exported modules had the path as the module URI on macs.

Also changes the QtQuick export back to 1.0 to make it work with
Qt 4.7.3. The version of that import statement does not actually matter
as long as it's valid.

Change-Id: Ib702356062bd239b1ad807c2592f8a69d6fde38f
Reviewed-on: http://codereview.qt.nokia.com/896
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherry picked from commit dc3e803614)
 2011-06-29 15:19:25 +02:00
con
42288b18f4 Fix upper bar in welcome mode. 
Change-Id: I83c5a7a0dcb5dab7cd428c6131b12abb140829b2
Reviewed-on: http://codereview.qt.nokia.com/889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-29 12:20:20 +02:00
Thomas Hartmann
11d4cbc141 QmlDesigner.NodeInstances: Fix that scene tranform isn't updated 
This change has to go to 2.3

Change-Id: I5d3ebfbff2df8129e5f6678e877c641e0ea926cb
Reviewed-on: http://codereview.qt.nokia.com/887
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 12:01:19 +02:00
Friedemann Kleint
e6e2db4733 Fix compile warnings. 
Change-Id: I4149cfd1e3f8f4946d229df37b6f8250e0daf169
Reviewed-on: http://codereview.qt.nokia.com/868
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-29 10:23:36 +02:00
hjk
fda652a43e debugger: rename gdbmacros* to dumper* 
Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 10:21:55 +02:00
Christian Kamm
6244008dcb qmldump: Improve error message for misbehaving plugin components. 
Change-Id: I7a7c4e5a0fc241a5cc6cb143df37cc63ea7711ea
Reviewed-on: http://codereview.qt.nokia.com/867
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-29 10:05:43 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +02:00
hjk
c88cf530fe debugger: prepare use of lldb/cdb with python 
Change-Id: If1906728047203128210a40c1b01211388f18ff1
Reviewed-on: http://codereview.qt.nokia.com/852
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-28 17:55:58 +02:00
hjk
70c6ed0d82 debugger: speedup QVariant dumper 
Essential for QObject, too.

Change-Id: Ie798227f6c8d07eff37e6dbadb7f6f5baa382ca8
Reviewed-on: http://codereview.qt.nokia.com/851
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-28 17:55:46 +02:00
Marco Bubke
6c2a84a736 QmlDesigner.NodeInstances: Fix repaint bug 
The dirtySceneTransform flag isn't reset by resetDirtyItem(). So we do it now
manually.

Change-Id: I2a908c18b2e05e9b6f40dc2994e765c37197a6d5
Reviewed-on: http://codereview.qt.nokia.com/848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 17:40:36 +02:00
Thomas Hartmann
e802690dbd QmlDesigner.propertyEditor: adding MouseAreaSpecifics.qml 
Change-Id: I407d72f904dc34f5c26d0724a6ec2ae134021d96
Reviewed-on: http://codereview.qt.nokia.com/847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 17:34:11 +02:00
Marco Bubke
ddb602536c QmlDesigner: Fix painted bounding rectangle for step childs 
We used only the bounding rectangle of the item under our control. But child
items which are created in a component can be out side of the bounding
rectangle. To fix compute a combined bounding rectangle of the item and all
stepchildren. Stepchildren described the child not create directly by us.

Change-Id: I7f25f112aa5eb2f80cfccec5d358221ab5e35d9b
Reviewed-on: http://codereview.qt.nokia.com/839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 16:26:26 +02:00
Marco Bubke
2d4b5fcb65 QmlDesigner: Fix slowness for many items 
The information change notifier provided no hint which infotmation changed.
So the property editor has updated the anchors for all information changes.
Now there is a hint and the update is only happen for a anchor change.

Change-Id: I3b6d7546f43bce4c08757662e7af32604a8db56f
Reviewed-on: http://codereview.qt.nokia.com/811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 13:47:56 +02:00
Thomas Hartmann
08e4b339f1 QmlDesigner.instances: allow fallback to item 
If we know from the (text editor) meta system that an object is an
(visible) item, we always create an item as fallback.

We might not be able to instaciate the original item.

Change-Id: I6851cd7a8de68d9d09b789927c204f0617017de7
Reviewed-on: http://codereview.qt.nokia.com/829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-28 13:36:48 +02:00
Christian Kamm
074ba8d142 QmlJS: Update builtin type descriptions for Qt 5 
qtdeclarative b2e2b070c499a04a3e2f270df62d5dd061e0c027

Change-Id: I8a6b5e0ffec996add654a2a8bf12f856349d71ab
Reviewed-on: http://codereview.qt.nokia.com/823
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-06-28 12:17:12 +02:00
Marco Bubke
0fcc6afd8f QmlDesigner: Split between bounding rectangle and painted bounding rectangle 
In qml the interactive bounding rectangle is always
QRectF(0, 0, width, height). The painted bounding rectangle can differ from
this logical one. This change is much more near to the qml description.

Change-Id: I139cb70512fa1ed003b28ca2ae512f4e33e915e5
Reviewed-on: http://codereview.qt.nokia.com/812
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 10:25:10 +02:00
Friedemann Kleint
33256aa617 L10n: Update German translation for 2.3. 
Change-Id: Id98dfc282737f10e17660b36efc57c67fdeb9bf6
Reviewed-on: http://codereview.qt.nokia.com/816
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-28 08:44:03 +02:00
Marco Bubke
52dcd28275 QmlDesigner.NodeInstances: Reduce repaints 
Change-Id: I39e7eae1036ee79689ccd49bfe900fee93a3454b
Reviewed-on: http://codereview.qt.nokia.com/808
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-27 21:34:42 +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
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
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
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
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
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
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
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
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
hjk
91c44b26c9 debugger: remove listing of breakpoints in dumper code 
This was meant to provide breakpoint notifications which are available
in gdb 7.3.50.x now.

Change-Id: I09ced542bb5171f10350b9dc722cab3376d1ded8
Reviewed-on: http://codereview.qt.nokia.com/650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-23 12:31:06 +02:00
Christian Kamm
46e970c37c qmldump: Fix for extended objects. 
Before, extended objects had the same exports as the base object
which lead to trouble.

Change-Id: Id40f0e0fd2211db95020ce224cf2c52939e68df7
Reviewed-on: http://codereview.qt.nokia.com/642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-23 11:01:15 +02:00
Marco Bubke
8fe3302329 QmlDesigner.NodeInstances: Move qmlpuppet to share 
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-22 18:24:36 +02:00
Kai Koehne
8ec524910a QtQuickApp wizard: Use qsTr() for string 
Change-Id: Ie2f40065c000b5bf588a0cd5470ec42091080c97
Reviewed-on: http://codereview.qt.nokia.com/621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-22 18:05:36 +02:00
hjk
ff94d06ae3 debugger: fix gcc 4.4's std::map display 
Was mentioned at

http://www.qtcentre.org/threads/41700-How-to-watch-STL-containers-iterators-during-debugging.

gcc 4.4 does not encode the allocator type properly so it can't be used
to extract the 'pair type' in the dumper.

Change-Id: I2cb09ce59865a87dc954fce433aef4826111a95a
Reviewed-on: http://codereview.qt.nokia.com/632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-22 17:46:56 +02:00