feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,748 Commits 108 Branches 368 Tags
1731911c4029d1b51a226e91a702f21bd13f108a
Commit Graph

2056 Commits

Author SHA1 Message Date
Pierre Rossi
b908a0f7b3 French translations for 2.3. 
This is the squashed result of work done by Thibaut Cuvelier
and Jonathan Courtois from developpez.com and myself (barely).

Full history is available on the team's repository:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

Change-Id: Ia9317f894f2df7096cc6a9c39093b417d0a2ba35
Merge-request: 370
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3056
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-17 10:21:18 +02:00
hjk
d2f995d8ef debugger: work on manual tests, rearrange format computation 
Change-Id: Ia1dc9f134fe19fc1607c150051381c61c0ad1469
Reviewed-on: http://codereview.qt.nokia.com/3053
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-16 18:38:27 +02:00
hjk
271055277c debugger: simplify unreachable branch in dumper code 
Change-Id: I00e7fdf3008119ec1b2fbd8acecdbb71b099dfc9
Reviewed-on: http://codereview.qt.nokia.com/3050
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-16 17:06:29 +02:00
hjk
bd1541e7db debugger: remove "alien" debugger support 
Change-Id: Ib007c8cb7ef96f59a738c6b59b81a5894c133f98
Reviewed-on: http://codereview.qt.nokia.com/3049
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-16 17:06:18 +02:00
hjk
eb91e9b51e debugger: also pretty-print typedefs to references 
Change-Id: Id845d9cf412efb6797feadcb4d83286d16db7123
Reviewed-on: http://codereview.qt.nokia.com/3048
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-16 17:06:09 +02:00
Sergey Belyashov
b15c517fb0 Fixed updating of translations for external tools 
Merge-request: 368
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ic7d33860b072d2a905cf28459e1da10e46d584db
 2011-08-16 10:36:22 +02:00
Sergey Belyashov
ca4b71f3d7 Updated Russian translation 
Merge-request: 369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I51d19c6bcb8c30128500af5d9f7c7afb3360a570
 2011-08-16 10:34:34 +02:00
Eike Ziller
bf8cb5d4fc Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
 2011-08-16 10:21:55 +02:00
Kai Koehne
5606b9d239 QtQuick wizard: Fix compilation for QT_USE_FAST_CONCATENATION 
Use QString().arg() instead of + , which might be undefined if the
user adds QT_USE_FAST_CONCATENATION to the .pro file.

Task-number: QTCREATORBUG-5796
Change-Id: Ic842cae650c8fa898d72065f3a1c672f5eb893d4
Reviewed-on: http://codereview.qt.nokia.com/2939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-16 08:58:04 +02:00
Eike Ziller
47f6cb398a Fix translation of external tools. 
Change-Id: I21541c579f3be75537763ad65b63f6804c329e50
Reviewed-on: http://codereview.qt.nokia.com/2951
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-15 16:37:14 +02:00
Robert Loehning
6958fbbe68 Fixed typo in French translation 
Task-number: QTCREATORBUG-5794

Change-Id: Iacb63b2069a6601a2350d358b985eed86f17f50d
Reviewed-on: http://codereview.qt.nokia.com/2948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-15 15:41:07 +02:00
Sergey Belyashov
916317a9fb Updated Russian translation 
Merge-request: 359
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee
 2011-08-12 19:28:31 +02:00
Beaver Xu
64e52980b9 Update chinese translation for 2.3 
Merge-request: 360
Reviewed-by: ossi

Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7
 2011-08-12 19:20:31 +02:00
axasia
e403f4d9f2 Update japanese translations for 2.3. 
Merge-request: 361
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5
 2011-08-12 17:27:11 +02:00
Kai Koehne
a78347e102 QmlJSDebugger: Remove unused toolbar 
This got disabled ages ago, but we never cleaned up the sources.

Change-Id: I3d172708002627c29816a6dc1e68b19b15fda372
Reviewed-on: http://codereview.qt.nokia.com/2776
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-11 10:19:03 +02:00
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +02:00
Robert Loehning
476338a6d2 Changed links to bugtracker to https 
Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-10 13:44:03 +02:00
Kai Koehne
c42e966184 JSDebugger: Only hit breakpoints in user code 
Check that the topmost stack entry is a user defined ScriptFunction.
This avoids hitting the anonymous functions used for bindings, e.g.

onClicked: Qt.quit()

leads to script code

(function onClicked() { Qt.quit(); })

which will be hit twice for the debugger: Once for the function call
itself, then for the execution of Qt.quit().

Change-Id: I4cb374782c93a26d97d4a717ce67d1fb2f6df438
Task-number: QTCREATORBUG-5090
Reviewed-on: http://codereview.qt.nokia.com/2746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-08 16:31:44 +02:00
hjk
2dc1ed8c32 debugger: add manual test for QHostAddress dumper 
Change-Id: I6cc146b1d5b21a4d4881a35a11ce24ad378e813c
Reviewed-on: http://codereview.qt.nokia.com/2694
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-05 15:07:06 +02:00
hjk
a5e893a428 debugger: improve QHostAddress dumper 
Change-Id: Ie1e52619a3fa8d47e60f6508aa9a6d5fc9a0d21b
Reviewed-on: http://codereview.qt.nokia.com/2693
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-05 14:43:30 +02:00
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