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
Kai Koehne
6aa615db52 Export S60DeployConfiguration class 
Allow the class to be used in QmlProfiler

Change-Id: I11e5bad9a836a0589f1cded431844c9cd8185e22
Reviewed-on: http://codereview.qt.nokia.com/426
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:34:01 +02:00
Kai Koehne
e1448381bc Export S60DeviceRunConfiguration class 
Allow class to be used in QmlProfiler. The patch moves
S60DeviceDebugRunControl(Factory) classes into their own files. Also,
make qt4Target(), qtVersion() protected and use the generic target()
method instead outside of the class.

Change-Id: I29e7609cf75d54e186fe2b9d66f52241f4fb4948
Reviewed-on: http://codereview.qt.nokia.com/425
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:33:52 +02:00
Kai Koehne
527aa1d66c Export CodaRunControl class 
Allow class to be used in qmlprofiler plugin.

Change-Id: I2bf055c287254ba4d541879d8c8ebc27fdd8887b
Reviewed-on: http://codereview.qt.nokia.com/424
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:33:38 +02:00
cerf
85cc1afe54 vcsbase: auto load/save settings in EditorParameterWidget 
Change-Id: If99006d418d8e3878677518a1bc0997bdfef38c6
Merge-request: 341
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-10 10:46:12 +02:00
Tobias Hunger
f82c4ea3c6 Tasks: Only report warning tasks in build progress 
Task-number: QTCREATORBUG-5020
Change-Id: Iead3d76509dd7b6d6c04d0ef64b7b3d2cad316d0
Reviewed-on: http://codereview.qt.nokia.com/369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-10 10:43:48 +02:00
Tobias Hunger
9f9d7bb12b Codepaster: Fix warning about hidden virtuals 
Change-Id: Id4838e20b4a62d31bf3d739836011e9bcfa2e335
Reviewed-on: http://codereview.qt.nokia.com/353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-10 10:43:37 +02:00
Friedemann Kleint
2da6f8d479 Wizards: Do not allow ~,! in file names. 
Task-number: QTCREATORBUG-5063

Change-Id: Ide80c5e52a867c45d8feb9109c65328bdda0f86c
Reviewed-on: http://codereview.qt.nokia.com/443
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-10 09:37:46 +02:00
dt_
39b7faa110 Fix first rename after creating a new project 
Change-Id: Iec997ba24a11a5035d3f70ce5818d44142f3c5a6
Task-Nr: QTCREATORBUG-5116
Reviewed-on: http://codereview.qt.nokia.com/440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-09 17:45:28 +02:00
Thomas Hartmann
fa48cf8a20 QmlDesigner.nodeInstanceView: adding parameter pathToQt 
The NodeInstanceView is now informed about the build pathToQt.

Change-Id: I728c9c356354ccf73599950c1c0bf4a96bd0a628
Reviewed-on: http://codereview.qt.nokia.com/437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:34:18 +02:00
Thomas Hartmann
cae968027a QmlDesigner.documentController: keep track of the current Qt Version 
Keeping track of the Qt Version and its binary path

Change-Id: I885880dd6ad45ea1fab7785cb043da1abd5aded3
Reviewed-on: http://codereview.qt.nokia.com/418
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 17:29:39 +02:00
Thomas Hartmann
85628119f2 QmlDesigner.formEditor: crash fix 
I had a crash here, because the qmlItemNode was invalid.

Change-Id: Ib6d8bbde7acf7e5f6a0fb56bf496c41df29f7142
Reviewed-on: http://codereview.qt.nokia.com/438
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:23:00 +02:00
Thomas Hartmann
58504e2182 QmlDesigner.nodeInstances: on windows executables end with exe 
On Windows executables have the suffix ".exe"
I also enclosed the strings with QLatin1String

Change-Id: Idf7a16ca6e0370f091225aaea7137418d8563aaf
Reviewed-on: http://codereview.qt.nokia.com/436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:22:26 +02:00
dt_
414d128627 Renaming files: fix case-change only renames 
Change-Id: Ie95133d22de33a0acca7756b8a41b3812e7dd9e7
Task-Nr: QTCREATORBUG-2434
Reviewed-on: http://codereview.qt.nokia.com/435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-06-09 16:49:11 +02:00
Christiaan Janssen
e463874ca6 QmlProfiler: disabled FPS display (for now) 
Change-Id: Ib35d3833e7d360b924ecaaaf46ae5c65f3bd7b8e
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 16:34:59 +02:00
Marco Bubke
d103bb7a60 QmlDesigner.NodeInstances: Support for Qt five scene graph 
QmlPuppet only supported GraphicsView. There is now Qml2Puppet which is
supporting the new Qt Scene Graph.

Change-Id: Ia0a06639cf6852192e84f7bfc2bea60532890b08
Reviewed-on: http://codereview.qt.nokia.com/433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 16:07:28 +02:00
Christiaan Janssen
74f1c2e277 QmlProfiler: removed scrollbar, timeline stretches automatically 
Change-Id: Ibc012d517556914e61ccbf58245a6d83cb4c8a80
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 15:35:09 +02:00
Christiaan Janssen
5e786fd128 QmlProfiler: renamed "Summary" tab to "Bindings" 
Change-Id: Ib6341937847cc784078f499dd0040456bd60efee
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/430
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 15:15:43 +02:00
Orgad Shaneh
4be9299f89 * External Tools: Added shortcut for menu entry 
Merge-request: 342
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ib765053e69f3917356ad30d70306165cfa19effa
 2011-06-09 14:41:58 +02:00
Sergey Belyashov
1f05dec2fc Updated Russian translation 
Merge-request: 343
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ie49d1abad19c69278767bf32f2a7fa908234293d
 2011-06-09 14:37:32 +02:00
Christiaan Janssen
ccd9354c29 QmlProfiler: renamed from "Perfomance Monitor" to "Profiler" 
Change-Id: I00e051f810fb147775c925f0e2378a46d660967e
Reviewed-on: http://codereview.qt.nokia.com/423
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 14:35:22 +02:00
dt_
57d1598d2c ProgressView: Also replace old tasks that are canceling 
Those tasks might not have finished yet, so there's a small race when
canceling and restarting a task.

Change-Id: I9f9ffcc6869455e7d8a407ff6ff4c40518d60f27
Task-Nr: QTCREATORBUG-4801
Reviewed-on: http://codereview.qt.nokia.com/419
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-09 14:25:38 +02:00
Thomas Hartmann
f38b0e7bd8 QmlDesigner.componentView: cleaning up 
There was some dead code I removed.
I also refactored the node removal and made it more robust.

Change-Id: I3bd566011302968c1d798689fcca3b4a3880b306
Reviewed-on: http://codereview.qt.nokia.com/417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 11:35:36 +02:00
Thomas Hartmann
0793a8dfb8 QmlDesigner.componentView: update and bug fixing 
I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 10:54:31 +02:00
Erik Verbruggen
f37e589e94 Added constant values for enumerators in their tooltips. 
Change-Id: I75c5dc43832d42588302bc0dadefcd4b6e2addc6
Reviewed-on: http://codereview.qt.nokia.com/414
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-09 09:35:19 +02:00
Thomas Hartmann
b9742018ee QmlDesigner.nodeinstances: adding missing files 
Change-Id: Ied53326c2f8c92b9af28591496e118eef69790b8
Reviewed-on: http://codereview.qt.nokia.com/410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 18:41:59 +02:00
Thomas Hartmann
76355f7c52 QmlDesigner.navigatorView: turn NavigatorView into a QmlModelView 
This will help in the future to add features like a context menu.

Change-Id: I194e79328b72798a8e000a8ca3abe48150965afb
Reviewed-on: http://codereview.qt.nokia.com/409
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 18:41:45 +02:00
Tommi Asp
deae00a12e BuildstepConfigWidgets can be set expanded by default 
(cherry picked from commit 517aef8b8bc705b055b10ef0b7b0b234fd80b920)

Change-Id: I517aef8b8bc705b055b10ef0b7b0b234fd80b920x
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/398
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 17:57:43 +02:00
Tommi Asp
66b415f903 Qt4ProjectManager exports for RemoteCompiler 
(cherry picked from commit 3112c23c702ee36ba1c25ccb526240ab7dda5b2e)

Change-Id: I3112c23c702ee36ba1c25ccb526240ab7dda5b2ex
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 17:57:37 +02:00
Christian Kandeler
033837dca6 Maemo: Remove MaemoToolChain::sysroot() method. 
Functionality is already in MaemoQtVersion.
Also move some environment stuff there.

Change-Id: Ibbe91aed5611b1fa60afd3954767596af74b8c80
Reviewed-on: http://codereview.qt.nokia.com/387
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-08 17:57:31 +02:00
Tommi Asp
462278b071 Custom targets can set QtVersion to support id and set abis 
QtVersion targetIds and abis set are forced
updateAbiAndMkspec() wont reset them
(cherry picked from commit 1c86ab05a73838e8127984f1cc0220d4de90eea5)

Change-Id: I1c86ab05a73838e8127984f1cc0220d4de90eea5x
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/396
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 17:57:17 +02:00
Thomas Hartmann
7939c270bd QmlDesigner.model: refactoring for nodeSource 
I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-08 17:53:11 +02:00
Tobias Hunger
3d784b84eb S60: Remove some dead code 
Change-Id: Ia7da72fa2a01cd3b563fcae0d7b4d1c99acc46eb
Reviewed-on: http://codereview.qt.nokia.com/384
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-08 17:51:15 +02:00
Tobias Hunger
eaf0c6c745 QmlDesigner: Fix warnings 
Change-Id: I21d103153dd0cebaf69ae57cbf19cfabd3ec3ead
Reviewed-on: http://codereview.qt.nokia.com/385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 17:40:25 +02:00
Thomas Hartmann
bfc68f150a QmlDesigner.documentController: fix text design synchronisation 
The synchronisation of selection between text and designmode was broken.
This fixes a regression.

Change-Id: I4d3fd2f9716398a16e01ce3d389d099bfad1f66b
Reviewed-on: http://codereview.qt.nokia.com/401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 17:26:08 +02:00
Kai Koehne
3f44219a9b AbstractMobileAppWizard: Allow subclasses to control the flow of pages 
The Symbian components wizard would like to hide e.g. the Orientation
page. Re-implementing nextId() will allow to do so.

Change-Id: Id748d88bbc28b93aba4ffe8fccebf540d0946686x
Reviewed-on: http://codereview.qt.nokia.com/395
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:32:19 +02:00
Kai Koehne
fa3976b3f1 Add TARGET.EPOCALLOWDLLDATA=1 to Qml Plugin Wizard 
Needed for Symbian.

Task-number: QTCREATORBUG-3507
Reviewed-by: Tim Jenssen
Reviewed-by: Alessandro Portale
Change-Id: I35799cd388e44353d6890fe79a411fbed2fb2ef3x
Reviewed-on: http://codereview.qt.nokia.com/394
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:32:11 +02:00
Leandro Melo
1bc9275917 Editors: Change Link color from inkpot scheme 
In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd

Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2x
Reviewed-on: http://codereview.qt.nokia.com/274
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit c09c870248)
Reviewed-on: http://codereview.qt.nokia.com/393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:32:03 +02:00
Leandro Melo
2cf06b8285 CMake editor: Use keywords scheme for functions 
The Link color from inkpot still needs to be changed.
This will be done in a following commit.

Task-number: QTCREATORBUG-5037
Change-Id: Ia8a5203067761ff6622258fd16f2027667637583x
Reviewed-on: http://codereview.qt.nokia.com/273
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit a3daedc7b7)
Reviewed-on: http://codereview.qt.nokia.com/392
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:31:50 +02:00
hjk
07c1609c0c cppeditor: fix crash on uninitialized pointer 
Reviewed-by: Erik Verbruggen
(cherry picked from commit 769b21b49d)
Change-Id: I769b21b49d4072e426ac82271ba7797461ef86d3x
Reviewed-on: http://codereview.qt.nokia.com/391
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:31:25 +02:00
hjk
a3137a031a add some mimetype for geometry shaders 
This gives at least some syntax highlighting.
(cherry picked from commit 04c5425de2)

Change-Id: I04c5425de2292c9da66c7c1dd2ae0c646528ca07x
Reviewed-on: http://codereview.qt.nokia.com/390
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:31:11 +02:00
hjk
87c515d1a3 debugger: show something when editing 
(cherry picked from commit 752066d043)

Change-Id: If24dfee05b8039b1f091e8f88e8d59155f2bd7dx
Reviewed-on: http://codereview.qt.nokia.com/389
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:30:59 +02:00
hjk
1a5df40883 debugger: allow "Attach to Core" on Windows 
Patch by Orgad Shaneh

Task-number: QTCREATORBUG-3813
Change-Id: I7ff88946981ef210bb53e20d7e462055199a30e2x
Reviewed-on: http://codereview.qt.nokia.com/388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 16:30:45 +02:00
Kai Koehne
2941045a9f QMakeStep: Ask whether to recompile if 'Enable QML debugging' changed 
Task-number: QTCREATORBUG-4633

Change-Id: I4116e63da6633bebb21ba08084e2d8edde4fbd6d
Reviewed-on: http://codereview.qt.nokia.com/383
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-08 15:32:16 +02:00
Christian Kandeler
af86ba8dfc RemoteLinux: Don't do a chmod on the executable before running. 
It does not seem to be necessary anymore, Harmattan does not support it,
and it was a hack in the first place.

Change-Id: I393fda9dbc45a9da5d270df3cfd0b90dbbfbdf2e
Reviewed-on: http://codereview.qt.nokia.com/386
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-08 15:02:25 +02:00
Kai Koehne
3485d7f5ca QmlDebugger: Always use ',block' argument 
This will allow e.g. the JS Debugger to catch scripts running at startup.

Change-Id: I00d339b06f1ed2b716c62bd2d53a32c2b20b1ddc
Reviewed-on: http://codereview.qt.nokia.com/377
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-08 14:39:13 +02:00
Christiaan Janssen
5a1f5c6fc8 QmlLivePreview: correctly formating file URL 
Change-Id: I7c77d7854dac8e28cd5bcdeb4e6a8687fdb8606e
Reviewed-on: http://codereview.qt.nokia.com/361
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-08 13:45:38 +02:00
Christian Kamm
aee9a55a81 QmlJS: Fix missing rehighlight if other file changes. 
When QML modules with many source files were loaded, the
rehighlight from the found library was done before the files
contained in the library were done parsing.

This way any updated document will eventually lead to the
current editor rehighlighting.

Reviewed-by: Erik Verbruggen
Change-Id: I0f4d18390d3e0ee17cd255c68496f61479f82f05x
Reviewed-on: http://codereview.qt.nokia.com/382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 13:30:47 +02:00
Christian Kamm
918a1653da QmlJS: Fix library-by-path imports. 
Fixes the problem 5426c3ac2c and
7b25f438c6 worked around.

Reviewed-by: Erik Verbruggen
(cherry picked from commit e21311132b)
Change-Id: I5426c3ac2cdf898ca1190a7746ba506ff24abc50xx
Reviewed-on: http://codereview.qt.nokia.com/381
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 13:30:38 +02:00
Christian Kamm
8b95ca8957 QmlJS: Allow for QML modules with version subdirectories. 
That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo

Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1ax
Reviewed-on: http://codereview.qt.nokia.com/194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
(cherry picked from commit 8742026380)
Reviewed-on: http://codereview.qt.nokia.com/380
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-08 13:29:59 +02:00
Jarek Kobus
2fad22c030 Add restore fallback functionality, make better tr() 
Task-number: QTCREATORBUG-5025
Change-Id: Ia3f6fa2380dd1a93f120873f584662a267ca4d50
Reviewed-on: http://codereview.qt.nokia.com/360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-08 13:27:52 +02:00