feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,071 Commits 108 Branches 368 Tags
a3bfafe7cb2f0bda8a124d6659a1b6900979c3ab
Commit Graph

18071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
a3bfafe7cb don't clobber encoding on rewriting file 2011-04-14 21:18:59 +02:00
Oswald Buddenhagen
69763557f6 show error string instead of error code ... 2011-04-14 21:18:17 +02:00
Oswald Buddenhagen
1f06972f1e don't ignore file changes while reload dialog is up 
we cannot clear the list of modified files after possibly entering the main
loop again, as that might discard new notifications which we have not
processed yet.

Reviewed-by: dt
 2011-04-14 21:08:55 +02:00
Tobias Hunger
c7c9238259 Fix upgrade of Symbian Qt versions from 2.1 
SBSv2 support has changed a bit.

Reviewed-by: Pawel Polanski
 2011-04-14 15:41:11 +02:00
Tobias Hunger
7328bce8a6 Set debugger when importing tool chains from old settings 
Set the default debugger when importing tool chains from old
settings. We just left the field blank before.

Task-number: QTCREATORBUG-4482
Reviewed-by: dt
 2011-04-14 15:41:10 +02:00
Beaver Xu
4d54a56b8a Update chinese translation 
Merge-request: 287
Reviewed-by: ossi
 2011-04-14 12:58:55 +02:00
Leena Miettinen
da0e926a41 Doc: update screenshots 
Gridlines were removed from several dialogs.
 2011-04-14 09:52:41 +02:00
Leena Miettinen
7ec61b0933 Doc: update breakpoint list 2011-04-14 09:52:39 +02:00
Leena Miettinen
7815f8cb04 Doc: shadow building is not supported for Maemo on Windows 
Reviewed-by: Christian Kandeler
 2011-04-14 09:52:36 +02:00
Oswald Buddenhagen
7edf08feff remove dead files 2011-04-13 21:29:26 +02:00
Oswald Buddenhagen
72b7e1c280 de-duplicate resource list 2011-04-13 21:26:35 +02:00
Oswald Buddenhagen
f8949efbf8 synchronize resources with their usage 
toolbutton is not used, while formeditorstylesheet and outputpane-style
are used but were not actually linked.
 2011-04-13 21:26:35 +02:00
Sergey Belyashov
0988a7c03c Updated Russian translation 
Merge-request: 2190
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-04-13 18:11:03 +02:00
hjk
4cced614dc fix script executable flags after license header changes 2011-04-13 18:00:50 +02:00
Tobias Hunger
17c5ac54ca Symbian: Always export SBS_HOME when building with SBSv2 
Always export SBS_HOME when building with SBSv2, even though that
is no longer required. Not doing so breaks Qt 4.6.3 support in the
SDK for some people.

Task-number: QTCREATORBUG-4487
Reviewed-by: Robert Loehning
 2011-04-13 17:00:26 +02:00
Christian Kandeler
941691140c Maemo: Fix Qemu button state. 
Took inactive targets into account.
 2011-04-13 16:23:34 +02:00
Christian Kandeler
486eae674b Maemo: Fix issue with cached device configuration. 
External functions need to access the real device config,
internal ones need the cached one during deployment.

Task-number: QTCREATORBUG-4514
 2011-04-13 16:06:31 +02:00
Kai Koehne
855582de91 QmlProject: Fix import of .qmlproject.user files from 2.1 
We changed the semantics of an empty 'mainScript' in the .user file:
In 2.1 it translated to 'use current file', while in 2.2 the default is now
to use the file specified in .qmlproject.

However, if there is no mainFile specified in .qmlproject we should
fall back to the current file in editor.

Reviewed-by: Christiaan Janssen
 2011-04-13 15:45:18 +02:00
Christian Kandeler
4097591301 Maemo: Use ABI for determining the gdb architecture string. 
Can't use MADDE, because it is outdated.

Reviewed-by: Tobias Hunger
Task-number: QTCREATORBUG-4299
 2011-04-13 15:27:17 +02:00
Christian Kandeler
433f3d17f5 Maemo: Don't use "new" MADDE features. 
The MADDE in the SDK is six months old...
 2011-04-13 15:27:17 +02:00
Jarek Kobus
3271a83389 Fix Polish punctuation 2011-04-13 15:14:17 +02:00
dt
10b8754fb2 Qt4RunConfiguration: Hide the run in console checkbox for simulator 
Reviewed-By: hunger
 2011-04-13 13:39:16 +02:00
dt
dd59a14936 CMakeProject: Fix wrong slots 
We never noticed that we had run cmake

Reviewed-By: hunger
 2011-04-13 13:39:06 +02:00
dt
8a276097c6 Fix available toolchains for cmake and generic project manager 
Reviewed-By: hunger
 2011-04-13 13:38:58 +02:00
dt
b9251a6626 Fix available QtVersion::availableToolchains 
Do really disable the symbian emulator if there's no toolchain
supporting it.

Reviewed-By: hunger
 2011-04-13 13:15:55 +02:00
dt
7d4311881b Fix toolchain restricted to targets handling 
Reviewed-By: hunger
 2011-04-13 13:15:55 +02:00
Jarek Kobus
081e300897 Update Polish translations 2011-04-13 13:12:08 +02:00
Friedemann Kleint
d146dd67f3 Debugger[CDB]: Fix assembly mode stepping. 
Snapped back to source mode as the pending variable was not set.

Reviewed-by: hjk
 2011-04-13 12:56:42 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tobias Hunger
61790e54e8 Maemo: Use debugger set up by the SDK 
Use the debugger set up by the Qt SDK instead of the one shipped
with Maemo/Meego.

Task-number: QTCREATORBUG-4299
Reviewed-by: Christian Kandeler
 2011-04-13 11:42:52 +02:00
dt
d0f7be188a Fix qt version number in Qt Quick Wizard 
Temporal lapse in understanding which qt version is required for the Qt
Quick Wizard. On Maemo we have the Qt Quick compat plugin which allows
the generated project to work with 4.7.0. In theory that doesn't apply
to symbian, but qt 4.7.0 does not support symbian. (And on the desktop
everyone has upgraded.)

Reviewed-By: ck
 2011-04-13 10:14:16 +02:00
Marco Bubke
075b0aeb09 QmlDesigner.NodeInstances: Use dummy data for components too 
Reviewed-By: Thomas Hartmann
 2011-04-12 19:24:11 +02:00
dt
e3c59a5800 TargetSetupPage: Disable editing build directory for symbian 
Shadow building is not supported so editing the path has no purpose.

Reviewed-By: hunger
 2011-04-12 19:07:40 +02:00
dt
cd21066469 Fix minimum qt version for mobile/html wizard 
That was broken by the TargetSetupPage refactoring

Task-Nr: QTCREATORBUG-4486
Reviewed-By: ck
 2011-04-12 19:07:32 +02:00
Thomas Hartmann
3ba60db656 QmlDesigner.meegoplugin: updating icons for Meego 2011-04-12 16:44:49 +02:00
Thomas Hartmann
b00b8fce54 QmlDesigner.propertyEditor: bugfix for Rectangle.radius 
Task-number: QTCREATORBUG-4285
Reviewed-by: Marco Bubke
 2011-04-12 16:44:49 +02:00
Daniel Molkentin
a22ad73b9a Prevent improper sizing of MiniProjectTargetSelector 
The selector would sometimes be too high (if projects were removed),
and sometimes show vertical scrollbars (if projects were added). This
problem was limited to the first time that the widget was opened on
all platforms but on OS X, where it could be observed persistently
and where its lack potentially can cause problems due to ed5d10a.

Reviewed-by: con
Task-Number: QTCREATORBUG-1792
 2011-04-12 16:40:24 +02:00
con
5467906f86 Fix expanding details button. 
Task-number: QTCREATORBUG-4467
Reviewed-by: Robert Loehning
 2011-04-12 16:37:24 +02:00
dt
4a6aaf26c9 Actually compile 
That's what you get for applying the patch, testing it and then applying
it again.
 2011-04-12 16:21:18 +02:00
dt
b7afe1e252 Fix deploy configuration for symbian 
Reviewed-By: hunger
Pathch-By: ppolanski
 2011-04-12 16:02:23 +02:00
Leena Miettinen
f638a141a1 Doc: pinning tooltips in Debug mode 
Reviewed-by: Friedemann Kleint
 2011-04-12 15:51:43 +02:00
Friedemann Kleint
28d5526459 Debugger[CDB]: Fix handling of shadowed variables. 
Fix name formatting and algorithm to find uninitialized
variables to use reverse order in case locals of the same
name occur in a scope.

Reviewed-by: hjk
Task-number: QTCREATORBUG-4475
 2011-04-12 11:57:57 +02:00
Friedemann Kleint
ff58d9960b L10n: Fix broken link in welcome page (tips). 
Task-number: QTCREATORBUG-4481
 2011-04-12 11:35:01 +02:00
Kai Koehne
3e0061aaba Revert "QmlJSEditor: Don't warn about failing dumps if dumper is from 2.1" 
This reverts commit d40c15abea.
Was superseded by 284b0827 (QmlJS: Don't warn user about imports if static info is available).
 2011-04-12 11:27:18 +02:00
Kai Koehne
3e07024e10 QmlJS: Don't warn user about imports if static info is available 
Don't underline the import if a qmldump fails,
but the typeinfo is available via a .qmltypes file. That should allow
users to 'fix' qmldump issues by shipping a .qmltypes file.

Reviewed-by: Erik Verbruggen
 2011-04-12 11:27:17 +02:00
Thomas Hartmann
f19669e661 QmlDesigner.symbianPlugin: fix typo 2011-04-12 10:30:45 +02:00
Christian Kandeler
454f0cb11e Maemo: Fix compilation. 2011-04-12 09:19:54 +02:00
Christian Kandeler
048756a66d Maemo: Get rid of some Q_ASSERTs that limit forward compatibility. 2011-04-12 08:15:29 +02:00
Christian Kandeler
37fa34e269 Maemo: Fix deployment issues with disabled packaging. 2011-04-12 08:15:28 +02:00
Robert Loehning
a0d1d7af4a Fix crash when closing QML files 
Reviewed-by: Thomas Hartmann
Task-number: QTCREATORBUG-4459
 2011-04-11 17:10:33 +02:00