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
Jarek Kobus
8ae36294c6 Polish Polish translation 
Change-Id: I5c48cd5cc5fcb8298dabb4a612a3fbb35ae6f491
Reviewed-on: http://codereview.qt.nokia.com/2679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-08-05 11:23:50 +02:00
Daniel Molkentin
9743b43663 Make Components installable. Fix Shadow Build. 
Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-03 16:12:35 +02:00
Daniel Molkentin
f0713a5ab6 Make session rows half as big in height as pojects rows. 
Change-Id: I8c24d4e939d2701c10444bb2c37921a095fe636b
Reviewed-on: http://codereview.qt.nokia.com/2523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-03 12:36:43 +02:00
Kai Koehne
ad3b92b1f4 QtQuickApp template: Don't enable qml debugging for every debug build 
This can be confusing, since there is also the switch in the qmake step,
which is on by default for debug builds too. However, if one disables it
you expect that debugging has in fact been disabled.

Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2
Reviewed-on: http://codereview.qt.nokia.com/2511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-02 15:40:35 +02:00
Thomas Hartmann
87fea757fb QmlDesigner.propertyEditor: fix for Image (2) 
Task-Number: QTCREATORBUG-5699
Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a
Reviewed-on: http://codereview.qt.nokia.com/2505
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 11:59:51 +02:00
Thomas Hartmann
aa2ba4c2a8 QmlDesigner.propertyEditor: fix for Image 
Task-Number: QTCREATORBUG-5700
Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941
Reviewed-on: http://codereview.qt.nokia.com/2504
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 11:58:55 +02:00
Thomas Hartmann
3571b9f31a QmlDesigner.propertyEditor: fix for border image 
SourceSize is read only.

Change-Id: If5fe2e25026098efde942bbc63948fd3e27f6545
Reviewed-on: http://codereview.qt.nokia.com/2506
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 11:58:35 +02:00
Thomas Hartmann
c1850305e6 QmlDesigner.propertyEditor: crash fix 
We did not handle the case that a gradient is a binding.

Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14
Reviewed-on: http://codereview.qt.nokia.com/2503
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 11:47:26 +02:00
Jarek Kobus
3e8ffed099 Update Polish translations 
Change-Id: I949a1c40fe9555857a77066b966be2928c26f1ad
Reviewed-on: http://codereview.qt.nokia.com/2502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-08-02 11:45:35 +02:00
Marco Bubke
26fbb50dc2 QmlDesigner.NodeInstances: Show binding in text if invalid 
If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 10:22:34 +02:00
Friedemann Kleint
bfa29c3efc Debugger[gdb]: Replace qptrdiff_t by any valid pointer type. 
For dumping Qt 5 types.

Change-Id: Ie5b051f73e6ae72a469133be0102de5dffa71db9
Reviewed-on: http://codereview.qt.nokia.com/2447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-01 17:01:23 +02:00
Friedemann Kleint
1066cf7359 Debugger[gdb]: Fix crash when stepping over QLocale initialization. 
Check the index before the array is accessed in the call item.

Task-number: QTCREATORBUG-5576
Change-Id: I3f533ef76af42dad97c93087f2d434b58fdedd44
Reviewed-on: http://codereview.qt.nokia.com/2044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-01 13:21:20 +02:00
Friedemann Kleint
d3e1a75b9b L10n: German translation for 2.3. 
Change-Id: I2a0ee7db27dba27d74a1d6a10a7e4ca7cb2d1282
Reviewed-on: http://codereview.qt.nokia.com/2428
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-01 08:56:03 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +02:00
Kai Koehne
52d2987e50 Provide qmlviewer in external tools menu 
Quite a few people have asked for previewing a .qml file in qmlviewer,
independent of the current project format.

Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5
Reviewed-on: http://codereview.qt.nokia.com/2397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-29 16:29:58 +02:00
Marco Bubke
754b993c36 QmlDesigner.NodeInstances: Add version to puppet 
Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-28 10:14:53 +02:00
Marco Bubke
776f19025e QmlDesigner.NodeInstances: Add a default dummy context 
Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:24 +02:00
Marco Bubke
2125638107 QmlDesigner.NodeInstances: Move context object to a context directory 
filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:14 +02:00
Thomas Hartmann
bc3b6ee076 QmlDesigner.propertyEditor: layout fix 
Adding an expanding widget to the layout

Task-number: QTCREATORBUG-5567
Change-Id: I6b52804af2bc798559661620605e2f8922a79ff0
Reviewed-on: http://codereview.qt.nokia.com/2286
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:26:09 +02:00
Marco Bubke
8870c86ad5 QmlDesigner.NodeInstance: Update the screen object if the root item size changed 
Change-Id: Ifc06131f4a57a30ab9b20687372150b23c8416cb
Reviewed-on: http://codereview.qt.nokia.com/2285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:43 +02:00
Marco Bubke
e4286b7dc2 QmlDesigner.NodeInstance: Reset items if the aux size is invalid 
Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:36 +02:00
Robert Loehning
55274e3822 Fixed German translation 
Change-Id: I6ba537b28c8cdcf8dfdc3f194682170829605caa
Reviewed-on: http://codereview.qt.nokia.com/2214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-26 17:43:25 +02:00
Kai Koehne
84743eff46 QmlJSLib: Fix linker errors with gcce 
usrt2_2.lib is passed to g++ before QmlJSDebugger.lib, which results
in errors about __aeabi_atexit, __dso_handle being undefined. Work around
this by explicitly adding usrt2_2.lib again after QmlJSDebugger.lib.

Task-number: QTCREATORBUG-5556
Change-Id: Id9e1dc19a2ee54e59d92470a35ccfd4946b07dcc
Reviewed-on: http://codereview.qt.nokia.com/2115
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-25 16:42:17 +02:00
Sergey Belyashov
aaab70f1bb Updated Russian translation 
Merge-request: 356
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Id1c812158def28788b4d4b73bff66d231d7a1e20
 2011-07-25 16:14:10 +02:00
Kai Koehne
0ec8817cbe QmlDbgHelper: Fix compilation for Symbian target in SDK 
The Symbian3Qt473 folder in the SDK contains a .qmake.cache
with invalid QMAKE_MOC path. Override this in the .pro file.
Also make sure that the .prl file is generated (create_prl was
set in the .qmake.cache)

Change-Id: Ibf905b4d9a8addf1b45a2ee40acdd0134da30e11
Reviewed-on: http://codereview.qt.nokia.com/1977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-25 15:46:37 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Daniel Molkentin
94055458ad WelcomeScreen: Clean up tag browser 
- Always show tag browser button
- Make tag browser button a toggle (popup semantics)
- Remove "Clear" Button

Change-Id: Ic1f6894103fdc14973c230764ffb06574dd1897b
Reviewed-on: http://codereview.qt.nokia.com/2048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 18:29:50 +02:00
Daniel Molkentin
26851ec3fa WelcomeScreen: Implementing proper search lexer/parser for the lineedit. 
Now copes with quotes and "tag:" prefixes.

Change-Id: I348e533ab290242fd05a034a2912cc95f0a9a3da
Done-with: Roberto Raggi
Reviewed-on: http://codereview.qt.nokia.com/2038
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 18:29:40 +02:00
Friedemann Kleint
d00fcc7892 L10n: German translation for 2.3. 
Change-Id: Ifef3c7042bafbcdf03d1c434d1bf971aa57ceba5
Reviewed-on: http://codereview.qt.nokia.com/2046
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-22 17:18:23 +02:00
con
bcb2965d09 Wrap "Click here for more" label. 
In case other languages show longer text.

Change-Id: Ied7ddc40d43f8c5c473345ee30d2ca63662a25e6
Reviewed-on: http://codereview.qt.nokia.com/2025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 15:11:13 +02:00
Thomas Hartmann
a558c3218b QmlDesigner.propertyEditor: support for line breaks in text edit 
Also fixing a crash regarding translation.

Task-number: QTCREATORBUG-5528
Task-number: QTCREATORBUG-5527
Change-Id: I478d72c3fc5e79919011ff709fcf363054fbca4e
Reviewed-on: http://codereview.qt.nokia.com/2028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 11:51:22 +02:00
Marco Bubke
f9a3fd338c QmlDesigner.NodeInstances: Reparent after value setting 
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 18:59:40 +02:00
Thomas Hartmann
06e21cf3f4 QmlDesiger.propertyEditor: fix for opacity 
Task-number: QTCREATORBUG-5517
Change-Id: I76ce708a4bcad0afe4716877d4c826d1a1a74537
Reviewed-on: http://codereview.qt.nokia.com/1963
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 16:08:33 +02:00
Thomas Hartmann
cb39679758 QmlDesigner.propertyEditor: fix ui for borders and colors 
Hiding controls was a bad idea. It is better to disable them and give
them sensible tooltips.


Task-number: QTCREATORBUG-4667
Task-number: QTCREATORBUG-5433
Change-Id: I2361fbbd3c28a5b9c07787abedf0439d6a7d1ad1
Reviewed-on: http://codereview.qt.nokia.com/1946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 13:28:43 +02:00
Thomas Hartmann
ef2023c5ff QmlDesigner.propertyEditor: layout fix 
Task-number: QTCREATORBUG-5522
Change-Id: I932a40e459ef1160fc362185b22e7dcd0db3237d
Reviewed-on: http://codereview.qt.nokia.com/1940
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:32:20 +02:00
Eike Ziller
ebf4212f71 Attach tags to bottom of description. 
Change-Id: Idbd219ec17ba36c14565c08be4c7cd2e1246f1b1
Reviewed-on: http://codereview.qt.nokia.com/1933
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-21 12:16:40 +02:00
Thomas Hartmann
ed678f8726 QmlDesigner.propertyEditor: layout fixes for expression editing 
Task-number: QTCREATORBUG-5045
Change-Id: Ie3ab670edef3aa82187ca0e4cfb1124218ff6a29
Reviewed-on: http://codereview.qt.nokia.com/1936
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:08:03 +02:00
Thomas Hartmann
467e94af2b QmlDesigner.property: small fix for font size 
Allow font sizes up to 400

Task-number: QTCREATORBUG-5555
Change-Id: I78fb5983353e0c45d6472b3af3142c8eee597643
Reviewed-on: http://codereview.qt.nokia.com/1938
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:06:42 +02:00
Thomas Hartmann
97ff8236e8 QmlDesigner.propertyEditor: fixes name of property 
Change-Id: I40861eb2bffa542578d69d4648ae358abea0aa4f
Reviewed-on: http://codereview.qt.nokia.com/1937
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 12:06:21 +02:00
Eike Ziller
8f95fb4996 Remove empty tab above news section. 
Change-Id: I5f7a05ebc7f7c44d55e916fec02eec7420b83f1d
Reviewed-on: http://codereview.qt.nokia.com/1921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-21 11:59:47 +02:00
Daniel Molkentin
94c8314343 Fixes and UI-Changes: 
- Swap Recent Sessions and Recent Projects
- Fix tooltip error
- Change column width ratio in develop screen from 50/50 to 40/60
- reapply fix for off-by-one pixel error in the tab widget

Change-Id: Ibbcea66262723fed1a54ac63b735bc25241d1846
Reviewed-on: http://codereview.qt.nokia.com/1891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:19 +02:00
Daniel Molkentin
a994a6dad0 Reapply 0461150b85. 
After conflict resolution.

Change-Id: I888b0d110d20df88e1cb96424717e914a9a613de
Reviewed-on: http://codereview.qt.nokia.com/1890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:26:12 +02:00
Daniel Molkentin
79ad453485 Reapply 22d6dfa45a 
without 'manage sessions' button after Jens' relayouting.

Change-Id: Ida3e2e01a2ecae258be026bab22c76ede26020f6
Reviewed-on: http://codereview.qt.nokia.com/1889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 17:25:17 +02:00
Jens Bache-Wiig
08f1e2e17a Fix tooltip and prettified Develop tab 
Change-Id: I422a15558305a805af5a037f7537daaddd866a92
Reviewed-on: http://codereview.qt.nokia.com/1651
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:55 +02:00
Jens Bache-Wiig
3d8fdcf02a Make use of splitters 
Change-Id: I02f0d4af1aedc45914424f68a32d3970bf936806
Reviewed-on: http://codereview.qt.nokia.com/1650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:49 +02:00
Jens Bache-Wiig
08ba842388 Fixed tabs and missing pixmap 
Change-Id: Ieaf7956f90a269cc582af5c6e8f08faa4b624b8e
Reviewed-on: http://codereview.qt.nokia.com/1649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:43 +02:00
Jens Bache-Wiig
db5f5d5676 Re-order the feedback buttons 
Change-Id: Ie10a5bc9394753aed5e13e772364d0357f577db1
Reviewed-on: http://codereview.qt.nokia.com/1587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:29 +02:00
Jens Bache-Wiig
0831e6e501 Improved resizing behavior 
Change-Id: I9f2156e996ea233cbe5424ad2e615e936b729443
Reviewed-on: http://codereview.qt.nokia.com/1578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:18 +02:00
Jens Bache-Wiig
e19dd9d1d6 Roll back some of the diff 
Change-Id: Id36db8de505be94ca2005280d16d767bafc21a23
Reviewed-on: http://codereview.qt.nokia.com/1573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:12 +02:00
Jens Bache-Wiig
592c2a498e Add missing hand cursor 
Change-Id: If94aaa48c7ede340d7886ba8fe5be140124ab562
Reviewed-on: http://codereview.qt.nokia.com/1572
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-20 16:07:07 +02:00