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
Pawel Polanski
445959eb23 Symbian: Creator crash when info is downloaded from device 
and there is a change in symbian devices connected to
the PC via the USB

Change-Id: Ib57b284978ca42940254c52d5cb4e394c6fd6ceb
Reviewed-on: http://codereview.qt.nokia.com/993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-07-01 09:36:59 +02:00
Eike Ziller
715d5e9938 Add changes file for 2.3 
Change-Id: Ie750fba5e7973f54f47f587382b863ba41f21b30
 2011-07-01 09:17:25 +02:00
Daniel Molkentin
39828704a9 WelcomeScreen: add qmldir to widgets 
Change-Id: I3ced362ce15e813120184f5acae098226efc428e
Reviewed-on: http://codereview.qt.nokia.com/960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-06-30 18:41:30 +02:00
Tobias Hunger
368f259d5e Fix unit test 
Change-Id: Ifb825f44aed8a0df90177a8d75ff6cc579df4d7a
Reviewed-on: http://codereview.qt.nokia.com/951
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-30 18:16:52 +02:00
Daniel Teske
d0de83d9bd Fix project tree, reported on irc 
Reviewed-By: Trust me
Change-Id: Iba035da372a2d005aa1fbf592b29da6b1176c352
Reviewed-on: http://codereview.qt.nokia.com/961
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-30 18:02:56 +02:00
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
Daniel Molkentin
a082518495 Add missing license headers 
Change-Id: Iaf30f92e49f4b3de4d7f7c48b22edf19b8286bf5
Reviewed-on: http://codereview.qt.nokia.com/957
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-30 17:37:34 +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
Daniel Molkentin
7a8599a99e fix superflous comma 
Change-Id: I87db58828035d4f2ff29285b7fb8a0acbaeda068
Reviewed-on: http://codereview.qt.nokia.com/953
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-30 17:24:18 +02:00
Thomas Hartmann
b6c4598682 QmlDesigner.library: fixing items in library 
Change-Id: Ic7e8e69ca2f0126c7464c09f8ea99e75cbe12684
Reviewed-on: http://codereview.qt.nokia.com/956
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:23:40 +02:00
Thomas Hartmann
cd7f466bb0 QmlDesigner.model: fixing checking for imports 
Change-Id: I878f429c94b75c229738dfc26806e29a5673b102
Reviewed-on: http://codereview.qt.nokia.com/955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:21:12 +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
18ca223447 Unmaximizing output pane should restore previous size. 
It was resetting to the default instead.

Task-number: QTCREATORBUG-4849
Change-Id: Ibe3acf7045dd051cca3bff94888b155e00fec81b
Reviewed-on: http://codereview.qt.nokia.com/954
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-30 17:08:34 +02:00
Daniel Teske
8c54fea884 QtVersionManager Options Dialog: Fix width of error label 
Change-Id: Ia18932d59e4d3a4301ee3520e281d07976a6548e
Task-Nr: QTCREATORBUG-5261
Reviewed-on: http://codereview.qt.nokia.com/952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-06-30 16:02:58 +02:00
Daniel Molkentin
e25d3dab5e docs: Forum Nokia -> Nokia Developer 
Change-Id: I80b2150611cca5301282eea05d590e63843a31aa
Reviewed-on: http://codereview.qt.nokia.com/945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-06-30 15:30:53 +02:00
con
f8ec6a1fa5 Build fix for Mac 10.5 
Change-Id: I28a047f1f17013b911d5ae0badefa18787151abe
Reviewed-on: http://codereview.qt.nokia.com/944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-06-30 13:58:00 +02:00
Daniel Teske
5c75f295e9 Also filter files found in OTHER_FILES for qml 
Change-Id: I85f6958017d18a868bd63745efdd850cabb43761
Reviewed-on: http://codereview.qt.nokia.com/902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-06-30 13:12:24 +02:00
Tobias Hunger
b90be2b5bf Alert the user that he might be missing a toolchain 
Change-Id: I2c9e3f9eab962b8310f21f9fe5fc392d88089c7f
Task-Nr: QTCREATORBUG-5248
Reviewed-on: http://codereview.qt.nokia.com/886
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-30 12:47:04 +02:00
Friedemann Kleint
9e5bcf2f4b Debugger [CDB]: Fix module resolution. 
Use breakpoint id as response id to identify breakpoints
in reponse to 'list breakpoint' command.

Change-Id: I31686aef0193bf2e26e38482c7efebf294a358c4
Reviewed-on: http://codereview.qt.nokia.com/940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-30 12:07:22 +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
Leandro Melo
754b8b3ac7 Editors: Dont configure form's text editor unnecessarily 
It's sufficient (and actually better) to configure the plain
text editor at the moment in which the xml is synchronized.

Task-number: QTCREATORBUG-5251
Change-Id: Ib2a3e1828f61770871486b8fbc1618abda1a5a74
Reviewed-on: http://codereview.qt.nokia.com/931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-30 11:23:15 +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
Marco Bubke
7ba726529e QmlDesigner.FormEditor: Fix handling of property changes 
Change-Id: I49d36574d4021b4c73c64873b1f21698c038498d
Task-number:  QTCREATORBUG-5226
Reviewed-on: http://codereview.qt.nokia.com/914
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:49:41 +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
con
3317acc9aa Merge remote-tracking branch 'origin/2.3' 2011-06-30 09:13: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
hjk
bbe427ac1f analyzer: reorganize local/remote starts 
Change-Id: I6273ea7ea50fd2bddad3a627e4616fe93e8398b9
Reviewed-on: http://codereview.qt.nokia.com/921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 18:44:46 +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
Kai Koehne
30ff312929 QtQuickApp wizard: Merge Components and Sources page 
Change-Id: I48e5009f2f71562a700eabddf38e54c1d4a127c1
Reviewed-on: http://codereview.qt.nokia.com/913
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-29 18:01:01 +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
4ae6c1da95 QmlDesigner.FormEditor: Fix cursor handling 
Change-Id: I533642ebf5d3937f96b248d7f999eb4928e035e9
Reviewed-on: http://codereview.qt.nokia.com/911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 16:33:32 +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
hjk
5ab3d58cce analyzer: remove unused DockWidgetEventFilter 
Change-Id: I0ddcd555efc900905703669040f792fb7c4d95c9
Reviewed-on: http://codereview.qt.nokia.com/909
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 16:27:52 +02:00
hjk
b6c0f3d8a6 analyzer: refactor AnalyzerManager 
Change-Id: Id925bb638b2757ef079c21192d4e2a8cc8f08694
Reviewed-on: http://codereview.qt.nokia.com/908
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 16:27:39 +02:00
Thomas Hartmann
ee595ceb3e compile fix 
Change-Id: I78394b14c8ec1eddfa9dd12243701bfaaeae9894
Reviewed-on: http://codereview.qt.nokia.com/905
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 15:57:45 +02:00
con
b20896b99e Merge remote-tracking branch 'origin/2.3' 2011-06-29 15:24:14 +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
Thomas Hartmann
37c01b399e QmlDesigner.formEditor: do not show items from a delegate (2) 
We also have to check for nodeSourceType() if a new node is created.

Task-number: QTCREATORBUG-5228
Change-Id: Ifccdcb29141c44c176b1a5292fd118e2af55ca5e
Reviewed-on: http://codereview.qt.nokia.com/901
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-29 15:17:47 +02:00
Kai Koehne
6d8d70d117 README: Fix directory where private headers can be found 
For out of source builds of Qt, the private headers are in
QT_BUILD_TREE (opposed to QT_INSTALL_PREFIX, or QT_SOURCE_TREE)

Change-Id: I3f22fdefffd43df4c71098425de4e44f561e6ab1
Reviewed-on: http://codereview.qt.nokia.com/900
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-29 14:35:57 +02:00
Christian Kamm
dc3e803614 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>
 2011-06-29 14:16:39 +02:00
dt_
8be917e3bd Remove unneeded code 
Change-Id: I334d7e21b09bc07a1ad20c08ca318e5e69d691bb
Reviewed-on: http://codereview.qt.nokia.com/885
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-06-29 14:12:41 +02:00
hjk
afed73f336 analyzer: dissolve "Start" menu button 
Icon missing.

Change-Id: I5217a79bfd892b662945513d31ffca4a967cadd9
Reviewed-on: http://codereview.qt.nokia.com/874
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 13:25:52 +02:00
hjk
a9c4ce2358 analyze: create a top level menu entry 
Change-Id: Iad7b54f6c651889284c2dd38cdeacac11ec6a12a
Reviewed-on: http://codereview.qt.nokia.com/873
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 13:25:34 +02:00