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
Tobias Hunger
255c5799f2 Git: Fix assert 
Refresh button states after running a checkout: The operation changes
the currently active branch and thus needs to disable e.g. the remove
action.

Change-Id: Id060ec63dbcf3c3132a832c2801073df5f9e91f1
Reviewed-on: http://codereview.qt.nokia.com/2195
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-26 14:40:37 +02:00
Christian Kandeler
174d7a8eff RemoteLinux: Remove knowledge about device types from generic class. 
Change-Id: I356d2ac0392a1c6544503ba80b338ee59223b3a6
Reviewed-on: http://codereview.qt.nokia.com/2191
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-26 14:09:07 +02:00
Leandro Melo
945b5f9a03 Preserve original line ending in find->replace 
Task-number: QTCREATORBUG-5581
Change-Id: Id1aae0d27d474ca051696032ab3b36e7783b766f
Reviewed-on: http://codereview.qt.nokia.com/2102
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-26 14:05:23 +02:00
Christiaan Janssen
3bd37a7160 QmlProfiler: variable width of status display 
Task-number: QTCREATORBUG-5610
Change-Id: Iffb94213fb209799f2ba55c1031c091c68ece4ea
Reviewed-on: http://codereview.qt.nokia.com/2190
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-26 14:04:23 +02:00
Tobias Hunger
8275ab0f6e GCC: Parse "In file included from blah:x:y:" 
Parse "In file included from blah:x:y:" correctly: Newer Gccs output
additional column information there.

Change-Id: I5fe2be72ce09390c0f1370fd9b72c900279d3207
Reviewed-on: http://codereview.qt.nokia.com/2188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-26 13:45:34 +02:00
Eike Ziller
e78bc71851 Fix crash when replying macro including alt+r 
Task-number: QTCREATORBUG-5331

Change-Id: Ice1b9d0bdd153e437e5a70b208947b6db98cc1e3
Reviewed-on: http://codereview.qt.nokia.com/2189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-26 13:44:32 +02:00
Kai Koehne
1f3ab9baf3 QmlDebugging: Enable help link for S60RunConfig 
Task-number: QTCREATORBUG-5609
Change-Id: I5e4d96b2cbd7c0bd70750010aee5c703c7b29f64
Reviewed-on: http://codereview.qt.nokia.com/2186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-07-26 13:21:45 +02:00
Tobias Hunger
70a2f91d77 Crash: Fix crash when importing broken Qt versions 
Fix a crash when importing a build, using a qmake that is broken.

I ran into this crash with a 32bit qmake used in a pure 64bit userland.

Change-Id: I08acb8d5f2cd72c873a30be5e45324f6daef702c
Reviewed-on: http://codereview.qt.nokia.com/2181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-26 12:31:12 +02:00
Friedemann Kleint
453ae2326f Fix Windows resource file qtcreator.rc. 
Use \\.

Change-Id: I63822a79cb6593111b39996c39d774434e291893
Reviewed-on: http://codereview.qt.nokia.com/2175
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-26 11:55:12 +02:00
Thomas Hartmann
1f2e1fa538 QmlDesigner.navigator: keep position while reparenting 
Task-number: QTCREATORBUG-3252
Change-Id: I03f335b1bc9943251dffba016ccf1d9b7b1e081e
Reviewed-on: http://codereview.qt.nokia.com/2170
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-26 11:32:38 +02:00
Robert Loehning
cdbd2344ee Added missing tr()s 
Change-Id: Ic4b558956764a141e470c24613c0572beeee4615
Reviewed-on: http://codereview.qt.nokia.com/2128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-26 10:14:45 +02:00
Christian Kandeler
a3f3ba23f3 RemoteLinux: Don't make emulator device settings fields read-only. 
This may not make sense for non-MeeGo platforms.

Change-Id: I94eec7ea4d4078ba7715431a0026f35585e23bc2
Reviewed-on: http://codereview.qt.nokia.com/2165
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-26 10:14:22 +02:00
Christian Kandeler
3f2d7e4a09 RemoteLinux: Move functions from Maemo-specific to generic class. 
Change-Id: If4884ffffd4398af7ba3ad1849399e8b722c1a49
Reviewed-on: http://codereview.qt.nokia.com/2164
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-26 10:13:39 +02:00
Tobias Hunger
02aee9bdb0 Fix layout in project mode 
Fix broken layout in project mode:
 * Code style settings were indented too much
 * Editor settings were indented too much

Change-Id: Id56f45566a87807588ac265db76a718d936dc4a5
Reviewed-on: http://codereview.qt.nokia.com/2125
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-07-25 17:33:44 +02:00
Christiaan Janssen
5003e78bef QmlProfiler: correctly displaying status when recording disabled 
Each time a new profiling session is started, the root component
is reloaded.  If Plotter.ranges contains data, which might be
the case when not recording, the count in the root item should
not be reset to 0, and the dataAvailable flag stay to true.

Change-Id: I2a34e30a4ae7179d3675b62792dcae7b9eba0462
Reviewed-on: http://codereview.qt.nokia.com/2118
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 17:16:58 +02:00
Christian Kandeler
e453c35cee RemoteLinux: Add missing copyright header. 
Change-Id: I0caa7d56ae500f15042b2ce3576196293c99f94a
Reviewed-on: http://codereview.qt.nokia.com/2121
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-25 16:50:12 +02:00
Christian Kandeler
ef8b1a17d0 RemoteLinux: Add missing const qualifier. 
Change-Id: I2085f30c594a902f96ac4d9612492cc17463f9f4
Reviewed-on: http://codereview.qt.nokia.com/2120
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-25 16:50:02 +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
Christiaan Janssen
b421f3eca7 QmlProfiler: managing failed starts gracefully 
Change-Id: Ice0debcb6b83977b8f50dd154687e7c5c6abac7b
Reviewed-on: http://codereview.qt.nokia.com/2113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 16:41:56 +02:00
Christian Kandeler
5f78511187 Maemo: Fix order of command line options for sysroot installations. 
Change-Id: Ib7b30a391afceec4262a396b3eca7893a6076ab8
Reviewed-on: http://codereview.qt.nokia.com/2117
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-25 16:35:20 +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
Christiaan Janssen
11f749663c QmlProfiler: supporting Application Output Pane buttons 
Task-Numbers: QTCREATORBUG-5548 5549 5550 5551 5552

Change-Id: I39a18e05967cf50eab2725cb65e6291d66c8af55
Reviewed-on: http://codereview.qt.nokia.com/2112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-25 15:52:53 +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
Friedemann Kleint
938bcae9d6 Debugger[CDB]: Fix breakpoint location correction in constructors. 
Change-Id: I638554936eae2db7ff2f55508d13f1c52c07f17d
Reviewed-on: http://codereview.qt.nokia.com/2114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-07-25 15:04:59 +02:00
Thomas Hartmann
bd81c93e03 QmlDesigner.rewriter: bugfix 
Reading the documentation helps.
We want 3 digits after the decimal point ('f')
not 3 significant digits ('g').

Task-number: QTCREATORBUG-5503
Change-Id: I90c16627904b81ea49d3d53d02e4d96787d0b73b
Reviewed-on: http://codereview.qt.nokia.com/2111
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-25 14:41:55 +02:00
Friedemann Kleint
613a4cc09c Debugger[CDB]: Re-enable grab widget. 
Broken by 7100d29f.

Change-Id: I7c7b8e071cd3713549316be35a8f9611f46c1212
Reviewed-on: http://codereview.qt.nokia.com/2107
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-25 14:11:52 +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
Thomas Hartmann
d7dfbf0990 QmlDesigner.propertyEditor: fix for undo/redo 
Reseting property editor undo/redo to simplify inner state
of the property editor.

Task-number: QTCREATORBUG-4672
Change-Id: I5446567e00068a0de1853c0c4271188135df330e
Reviewed-on: http://codereview.qt.nokia.com/2104
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-25 13:03:27 +02:00
Oswald Buddenhagen
899cc03003 Revert "RemoteLinux: Temporary changes for RDADeployment plugin." for master merge. 
This reverts commit e6dbfb2d1a.
 2011-07-25 12:52:11 +02:00
Tobias Hunger
c56c9cf4e7 Generic Project: Propagate toolchain changes 
Change-Id: I629101990fb041aa421803dc5485e59acc8a7dd2
Reviewed-on: http://codereview.qt.nokia.com/1525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-25 12:06:03 +02:00
Christian Kandeler
76a5b1953c RemoteLinux: Move constants and functions to more suitable locations. 
Mostly to facilitate splitting up generic Linux und Maemo-specific
things.

Change-Id: I6072ae7deaea013219e8969d6a5254e6c5c96693
Reviewed-on: http://codereview.qt.nokia.com/2098
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-25 12:00:37 +02:00
Thomas Hartmann
3aa8f94ed5 QmlDesigner.contextMenu: disable reset if properties are not defined 
Reset Size is now disabled if the item(s) has no property "width" and "height".
The same for Reset Position and "x" and "y".

I added const QList<ModelNode> &selectedModelNodes =  m_view->selectedModelNodes();
to clean up the code.

Task-number: QTCREATORBUG-5573
Change-Id: I7383e28a7b304bcfa27a5687e84d9f489dfc8a02
Reviewed-on: http://codereview.qt.nokia.com/2094
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-25 10:36:31 +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
Christian Kandeler
92d32becfc RemoteLinux: Internal settings pages improvements. 
- Use better strings for category and id.
- Don't set display category and icon again in Qemu settings page.

Change-Id: I054d70bbd59521ca22f528ecb42eee35ecb73ecd
Reviewed-on: http://codereview.qt.nokia.com/2049
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 18:25:20 +02:00
Tommi Asp
e6dbfb2d1a RemoteLinux: Temporary changes for RDADeployment plugin. 
Export some classes.

Change-Id: Ib959273f4204854b7ce4834afaf84c8222efa9aa
Reviewed-on: http://codereview.qt.nokia.com/2047
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 17:56:06 +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
Christian Kandeler
fa33ff0a33 RemoteLinux: Split up settings pages files. 
We need to have separate ones for remote Linux in general
and Maemo-specific stuff.

Change-Id: Ib3aa5f0abb90446f356a6c75b8754388346eacb0
Reviewed-on: http://codereview.qt.nokia.com/2045
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 17:10:54 +02:00
Christian Kandeler
33c8dcf310 RemoteLinux: Remove unneeded #include from header file... 
... and add it to all the files which inadvertantly relied on it.

Change-Id: Icc5bb12592fb32c79d19c720de69e405a50b375f
Reviewed-on: http://codereview.qt.nokia.com/2043
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 16:15:36 +02:00
Christian Kandeler
bbbda740c3 RemoteLinux: Rename and export MaemoUsedPortsGatherer. 
Class is not Maemo-specific.

Change-Id: I14473cb329e4955d24dae1a1a4961eb6ebff869c
Reviewed-on: http://codereview.qt.nokia.com/2042
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 16:11:15 +02:00
Christiaan Janssen
02120e45e7 QmlProfiler: refactored warning messagebox 
Change-Id: I41e361fc2dc1cab0f103eccbb15b9c38cc78cb77
Reviewed-on: http://codereview.qt.nokia.com/2041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-22 15:59:36 +02:00
Daniel Molkentin
cd9fceba3a WelcomeScreen: fix Regression 
Dropping files on the welcome screen would not open them.

Change-Id: I8ea6b4a55abdec47e40fdeb02d97f45d22db2fb1
Reviewed-on: http://codereview.qt.nokia.com/1992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-22 15:47:51 +02:00
Daniel Molkentin
00658bd19f Git: Ignore more generated files 
Change-Id: Ic640fcf4f266de92077c733727f5bc8aa08625e2
Reviewed-on: http://codereview.qt.nokia.com/1939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-22 15:43:36 +02:00
Christiaan Janssen
678e6b1e2c QmlProfiler: show warning when no executable given 
Task-number: QTCREATORBUG-5266
Change-Id: If1639e322f4ab0d7065e3394129c6649f17e98c9
Reviewed-on: http://codereview.qt.nokia.com/2039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-22 15:37:40 +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
Leena Miettinen
b7090ef24b Doc: fix the Battery Status example code 
Add example source files to the repository and use snippets in the doc.

Change-Id: I7ce13c2d5d0994a92d1b001e19af28aec8049e8e
Reviewed-on: http://codereview.qt.nokia.com/2030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-07-22 14:59:06 +02:00
Christian Kandeler
9d5f420f4d RemoteLinux: Rename a bunch of classes. 
They still had "Maemo" in their names, even though
they are not Maemo-specific (and will not move
to the respective plugin).

Change-Id: I5eec0de27db8340f2a987a6ed685b3ae46ec17b0
Reviewed-on: http://codereview.qt.nokia.com/2036
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-22 14:39:46 +02:00
Thomas Hartmann
6bebdf25fb QmlDesigner.propertyEditor: fixing restoring values for anchors 
Restoring values properly after removing anchors.
Some code cleanup.

Task-number: QTCREATORBUG-4837
Task-number: QTCREATORBUG-5303
Change-Id: Ibb3223b696b6ac0298d746223f5a6e90562f3db0
Reviewed-on: http://codereview.qt.nokia.com/2034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 13:41:16 +02:00
Thomas Hartmann
8f5e2094a9 QmlDesigner.propertyEditor: reduce delay 
Since we changed the slection behaivour after drag and drop
this makes the designer more responsive.

Change-Id: I21c14a126ff0b63151002ac51e841a624b43e879
Reviewed-on: http://codereview.qt.nokia.com/2033
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 13:40:41 +02:00
Thomas Hartmann
6b19e15958 QmlDesigner.rewriter: fixing compare function 
Comparing doubles is hard.
I forgot to round properly.
I also added some early rejects.

Task-number: QTCREATORBUG-5503
Change-Id: I959abbe28a312aea63a170d9c769b5555ac6a30e
Reviewed-on: http://codereview.qt.nokia.com/2032
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-22 13:01:33 +02:00