OSDN Git Service
Friedemann Kleint [Mon, 7 Jun 2010 12:53:28 +0000 (14:53 +0200)]
VCS/Diff editors: Set readonly attributes correctly.
Make VCS-generated editors read-only, enable editing
when opening a patch.
Make VCS-Editor non-read-only by default, add setter
for "Forced read-only" that makes it a temporary,
read-only file.
Task-number: QTCREATORBUG-1528
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
con [Mon, 7 Jun 2010 11:45:49 +0000 (13:45 +0200)]
Version bump.
hjk [Mon, 7 Jun 2010 10:26:34 +0000 (12:26 +0200)]
doc: adjust description of python dumper classes to reality
Erik Verbruggen [Mon, 7 Jun 2010 10:16:09 +0000 (12:16 +0200)]
Fixed invalid and unreachable code.
Reviewed-by: holmstedt
dt [Thu, 3 Jun 2010 11:55:16 +0000 (13:55 +0200)]
Fix crash on session restore
Do the project restore for each project directly after opening and only
then processEvents(). A project might be in a intermediate state between
opening and restoring.
Robert Loehning [Mon, 7 Jun 2010 09:50:38 +0000 (11:50 +0200)]
Symbian/Trk: Don't try to download a file without respective flag set.
Task-number: QTCREATORBUG-1567
Reviewed-by: Friedemann Kleint
Daniel Molkentin [Mon, 7 Jun 2010 09:15:36 +0000 (11:15 +0200)]
Allow F1 on projects mode
Reviewed-By: Leena Miettinen
Reviewed-By: kh1
Daniel Molkentin [Mon, 7 Jun 2010 09:15:02 +0000 (11:15 +0200)]
Fix session dialog help link
Reviewed-By: Leena Miettinen
Daniel Molkentin [Mon, 7 Jun 2010 09:14:19 +0000 (11:14 +0200)]
Fix F1 on welcome page
Reviewed-By: kh1
Lasse Holmstedt [Mon, 7 Jun 2010 08:25:39 +0000 (10:25 +0200)]
Fixed disabled checkbox styles for plugin manager
Reviewed-by: jbache
Oswald Buddenhagen [Fri, 4 Jun 2010 17:14:18 +0000 (19:14 +0200)]
disable outdated and known bad translations
Oswald Buddenhagen [Fri, 4 Jun 2010 15:08:27 +0000 (17:08 +0200)]
make the evaluator (even more) thread-safe
the async re-parsing code breaks the assumption that project
parsing only ever starts with a single non-concurrent evaluation
(of the top-level project file), so the population of the base
values in the shared ProFileOption was happily causing crashes.
Reviewed-by: dt
Task-number: QTCREATORBUG-1569
Oswald Buddenhagen [Fri, 4 Jun 2010 14:58:23 +0000 (16:58 +0200)]
add "static"
Robert Loehning [Fri, 4 Jun 2010 14:55:47 +0000 (16:55 +0200)]
Doc - Avoid warnings in doc.
Reviewed-by: Leena Miettinen
Leena Miettinen [Fri, 4 Jun 2010 13:13:08 +0000 (15:13 +0200)]
Doc - Update screen shots.
Leena Miettinen [Fri, 4 Jun 2010 13:12:47 +0000 (15:12 +0200)]
Doc - Update information about managing sessions and screenshots.
Reviewed-by: dt
Leena Miettinen [Fri, 4 Jun 2010 09:46:49 +0000 (11:46 +0200)]
Doc - Add note about finding out the Symbian platform version on a device for TRK installation.
Reviewed-by: Tim Jenssen
Leena Miettinen [Fri, 4 Jun 2010 09:31:22 +0000 (11:31 +0200)]
Doc - Add link to platform notes.
Reviewed-by: olli
Reviewed-by: Niels Weber
Leena Miettinen [Fri, 4 Jun 2010 09:18:09 +0000 (11:18 +0200)]
Doc - Update CMake screenshots and edit related text.
Leena Miettinen [Fri, 4 Jun 2010 09:17:22 +0000 (11:17 +0200)]
Doc - Update Locator screen shots and modify related text.
Daniel Molkentin [Fri, 4 Jun 2010 13:02:25 +0000 (15:02 +0200)]
Revert "Add missing style sheet"
This was adding the generated style sheet
This reverts commit
ad3d3dac04600177fa5d62e3773107c2be886cf8.
Daniel Molkentin [Fri, 4 Jun 2010 12:57:05 +0000 (14:57 +0200)]
Add missing style sheet
Reviewed-by: Leena Miettinen
Daniel Molkentin [Fri, 4 Jun 2010 12:49:25 +0000 (14:49 +0200)]
Fix mobile example link
Task-number: QTCREATORBUG-1571
Reviewed-by: Leena Miettinen
Daniel Molkentin [Fri, 4 Jun 2010 12:40:33 +0000 (14:40 +0200)]
Fix help being unusable in split mode by using Qt doc offline style
Reviewed-by: Leena Miettinen
mae [Fri, 4 Jun 2010 11:39:31 +0000 (13:39 +0200)]
Fix cursor positioning for up/down after backspace
Reviewed-by: Roberto Raggi
ck [Fri, 4 Jun 2010 11:12:47 +0000 (13:12 +0200)]
Maemo: Adapt qemu path for Harmattan.
Reviewed-by: kh1
Kai Koehne [Fri, 4 Jun 2010 11:09:24 +0000 (13:09 +0200)]
Mention QTCREATOR_WITH_QML environment variable in README
We disabled the visible parts of the Qml support by default for the 2.0
release. Defining QTCREATOR_WITH_QML brings it back.
This hack should be removed as soon as 2.0 is shipped.
Reviewed-by: Daniel Molkentin
Daniel Molkentin [Fri, 4 Jun 2010 10:43:10 +0000 (12:43 +0200)]
Two descriptions in the file new dialog were swapped
No strings translations were harmed in this commit. No kittens either.
Reviewed-by: Alessandro Portale
hjk [Fri, 4 Jun 2010 10:53:38 +0000 (12:53 +0200)]
fakevim: fix cursor keys on Mac.
On Mac, QKeyEvent::text() returns non-empty strings for cursor keys. This
breaks some of the logic relying on text() being empty for "special" keys.
This is a quick fix to make it usable.
Kai Koehne [Thu, 3 Jun 2010 10:53:53 +0000 (12:53 +0200)]
QuickDesigner: Fix core test
Since
fa640f66db we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.
Kai Koehne [Thu, 3 Jun 2010 10:52:09 +0000 (12:52 +0200)]
QuickDesigner: Fix compilation of QuickDesigner/core tests
Commit
112df597dbff removed the definition, but not declaration of
test method.
Reviewed-by: erikv
hjk [Fri, 4 Jun 2010 07:07:09 +0000 (09:07 +0200)]
fakevim: clear opcount and mvcount on escape
Daniel Molkentin [Thu, 3 Jun 2010 18:01:19 +0000 (20:01 +0200)]
Update the doc style from Qt
Reviewed-by: Oswald Buddenhagen
Pierre Rossi [Thu, 3 Jun 2010 14:04:27 +0000 (16:04 +0200)]
Fix an issue with 'make ts' when CUSTOMWIZARDS_FILES is empty.
Reviewed-by : Daniel Molkentin
(cherry picked from commit
514b30ecbf105da2c6109470b2a8b2571c22654c,
this was accidentially committed into 2.0.0 first)
Christian Kamm [Thu, 3 Jun 2010 08:25:17 +0000 (10:25 +0200)]
Make the QmlJSEditor work when Qml support is disabled.
- Enable qmlprojectplugin even if Qml support is disabled.
- But disable its wizards in that case.
- Disable the Qml file wizard if the support is off.
Reviewed-by: Kai Koehne
Leena Miettinen [Wed, 2 Jun 2010 14:47:02 +0000 (16:47 +0200)]
Doc - Update screenshots and some related text.
Leena Miettinen [Wed, 2 Jun 2010 14:40:17 +0000 (16:40 +0200)]
Doc - Hid all information related to Qt Quick by using if defined(qtquick) tags.
Thorbjørn Lindeijer [Wed, 2 Jun 2010 12:51:03 +0000 (14:51 +0200)]
Some initialization and removed redundant member variables
Reviewed-by: kh1
Thorbjørn Lindeijer [Wed, 2 Jun 2010 12:50:15 +0000 (14:50 +0200)]
Initialize some members in default constructor of FilterEntry
Thorbjørn Lindeijer [Wed, 2 Jun 2010 09:20:56 +0000 (11:20 +0200)]
Only do line selection in the gutter when the line numbers are visible
While
2641496a997 removed the marks check entirely, a fix for the same
issue made on the master branch (
1263babfc6c96) changed it to check
whether the line numbers are visible. This is more correct.
Reviewed-by: mae
dt [Wed, 2 Jun 2010 09:58:25 +0000 (11:58 +0200)]
Fix crash with removing files in symlinked directories
Reviewed-By: thorbjorn
Task-Nr: QTCREATORBUG-965
hjk [Wed, 2 Jun 2010 09:09:14 +0000 (11:09 +0200)]
fakevim: synchronize with master
In theory this should have been a backport of the search-related commits
7e8c345a and
46fa3aa7, but they are buried in the middle of the Big
Commandline Reorganization. Just taking everything has lower risk and
is faster.
kh1 [Tue, 1 Jun 2010 15:38:15 +0000 (17:38 +0200)]
Fix MADDE and pkg-config with QtCreator.
We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.
Reviewed-by: kh
(cherry picked from commit
0017103863bc79f7f12eb60bb9e64812f9ffa22a)
(cherry picked from commit
9f8da8aa193088097ca0f5996cfa184d2476b30a)
Leena Miettinen [Tue, 1 Jun 2010 15:12:46 +0000 (17:12 +0200)]
Doc - Edit build and run instructions for Symbian target
Leena Miettinen [Tue, 1 Jun 2010 15:12:13 +0000 (17:12 +0200)]
Doc - Change version number to v2.0
Leena Miettinen [Tue, 1 Jun 2010 15:11:49 +0000 (17:11 +0200)]
Doc - Add information about creating Maemo installation packages. Edit instructions for setting up development environment for Maemo. Add not about encrypted keys not being supported.
Reviewed-by: kh
hjk [Tue, 1 Jun 2010 12:35:51 +0000 (14:35 +0200)]
debugger: always switch to frame 0 before trying to leave frame
Daniel Molkentin [Tue, 1 Jun 2010 14:23:38 +0000 (16:23 +0200)]
Disable QML runtime wizard for now.
This is unconditional, since we seem to have no way of doing it
conditionally in a clean way.
Reviewed-by: Oswald Buddenhagen
Robert Loehning [Tue, 1 Jun 2010 14:15:45 +0000 (16:15 +0200)]
Fixes in German translation
Reviewed-by: Oswald Buddenhagen
Robert Loehning [Tue, 1 Jun 2010 13:08:39 +0000 (15:08 +0200)]
Decided on different use of hyphens in German translation.
Reviewed-by: Oswald Buddenhagen
Daniel Molkentin [Tue, 1 Jun 2010 12:39:31 +0000 (14:39 +0200)]
Revert "Mark QML support in Qt Creator 2.0 as preview"
Not needed anymore after the general QML support got deactivated.
This reverts commit
74bd95d3238dca1c6e22fb3faa59b94f590b1ac8.
hjk [Tue, 1 Jun 2010 11:13:27 +0000 (13:13 +0200)]
debugger: be nicer in the presence of missing debug information
hjk [Tue, 1 Jun 2010 11:12:03 +0000 (13:12 +0200)]
debugger: switch off reverse debugging tool button if not useful
Daniel Molkentin [Tue, 1 Jun 2010 10:51:18 +0000 (12:51 +0200)]
Disable everything QML-related but QMLJSEditor by default
To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake
Reviewed-by: Kai Koehne
Robert Loehning [Tue, 1 Jun 2010 11:54:07 +0000 (13:54 +0200)]
Fixed German translations related to Design mode and Qt Quick.
Reviewed-by: Oswald Buddenhagen
Thorbjørn Lindeijer [Tue, 1 Jun 2010 11:04:05 +0000 (13:04 +0200)]
Fixed context help for Qt includes
Was broken in
915a07bdbbd5dc65332369a117acde58793a165d, which caused
help links only to be resolved for expressions under the cursor.
Task-number: QTCREATORBUG-159
Reviewed-by: ckamm
Thorbjørn Lindeijer [Tue, 1 Jun 2010 10:39:08 +0000 (12:39 +0200)]
Fixed line select in gutter when text marks are not visible
The ProjectFilesEditor used for editing the generic project's files does
not show text marks, which broke the line select in the gutter.
Task-number: QTCREATORBUG-1238
Reviewed-by: mae
hjk [Tue, 1 Jun 2010 10:32:52 +0000 (12:32 +0200)]
debugger: make ctrl-click to navigate between input and output pane (much) faster
Thorbjørn Lindeijer [Mon, 31 May 2010 11:48:40 +0000 (13:48 +0200)]
Fixed the collapsed block popup to draw on top of cursor/highlights
The various text editor overlays and the text cursor were being painted
on top of the collapsed block popup.
Reviewed-by: mae
Leena Miettinen [Tue, 1 Jun 2010 07:23:52 +0000 (09:23 +0200)]
Doc - Update screen shots.
Leena Miettinen [Tue, 1 Jun 2010 07:23:18 +0000 (09:23 +0200)]
Doc - Add a disclaimer for QDeclarative functions and documentation.
Leena Miettinen [Tue, 1 Jun 2010 07:22:44 +0000 (09:22 +0200)]
Doc - Added the firmware version of Nokia N900 software update release 1.2.
Leena Miettinen [Tue, 1 Jun 2010 07:21:53 +0000 (09:21 +0200)]
Doc - Update the mobile example to include instructions for testing on devices.
Thorbjørn Lindeijer [Mon, 31 May 2010 16:07:34 +0000 (18:07 +0200)]
Open .prf files in the pro file editor
This fixes QTCREATORBUG-1434, but it's more of a workaround than a fix.
The problem was that the file was opened in the diff editor due to a
broken diff detection, and the diff editor in turn has a bug in that
it's kind of halfway read-only.
Reviewed-by: ossi
Task-number: QTCREATORBUG-1434
Daniel Molkentin [Mon, 31 May 2010 14:36:48 +0000 (16:36 +0200)]
Mark QML support in Qt Creator 2.0 as preview
Reviewed-by: Kai Koehne
Erik Verbruggen [Mon, 31 May 2010 13:03:38 +0000 (15:03 +0200)]
Fixes rounding errors in block positions.
Influences the position of the folded-block markers.
Reviewed-by: thorbjorn
Sergey Belyashov [Mon, 31 May 2010 13:04:47 +0000 (15:04 +0200)]
Updated Russian translation
Merge-request: 143
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Daniel Molkentin [Mon, 31 May 2010 11:56:58 +0000 (13:56 +0200)]
Remove accidentially committed symlinks
Daniel Molkentin [Mon, 31 May 2010 10:08:18 +0000 (12:08 +0200)]
Add links for building an example and building a mobile application
Reviewed-by: Leena Miettinen
Daniel Molkentin [Mon, 31 May 2010 10:07:08 +0000 (12:07 +0200)]
Do not try to force a version, this heuristic breaks too often.
Reviewed-by: Leena Miettinen
Daniel Molkentin [Mon, 31 May 2010 09:22:24 +0000 (11:22 +0200)]
Fix doc links to tips of the day, remove some to minimize l10n breakage.
Reviewed-by: Leena Miettinen
ck [Mon, 31 May 2010 10:12:37 +0000 (12:12 +0200)]
SSH: Fix Net7 crash.
Reviewed-by: kh1
Erik Verbruggen [Mon, 31 May 2010 10:21:12 +0000 (12:21 +0200)]
Fixed default property discovery for custom QML components.
Reviewed-by: Christian Kamm
Erik Verbruggen [Mon, 31 May 2010 09:48:18 +0000 (11:48 +0200)]
Fixed possible crash.
Reviewed-by: Christian Kamm
Erik Verbruggen [Mon, 31 May 2010 09:17:42 +0000 (11:17 +0200)]
Removed invalid testcase.
Reviewed-by: Christian Kamm
Marco Bubke [Wed, 26 May 2010 16:05:49 +0000 (18:05 +0200)]
Do reparenting only with the control modifier hold
The isContainer flag is now ignored.
Reviewed-by: kkoehne
Daniel Molkentin [Mon, 31 May 2010 09:04:00 +0000 (11:04 +0200)]
Do not add a menu if the examples cannot be found.
This is not only a waste of ressources, but breaks a check later on
which tries to load the QML examples from Creators ressource path
if no QML capable Qt version is found (included with Creator packages)
Reviewed-by: dt
Erik Verbruggen [Mon, 31 May 2010 09:03:59 +0000 (11:03 +0200)]
Remove snippet tooltip when completion list looses focus.
Task-number: QTCREATORBUG-1425
Reviewed-by: Christian Kamm
Marco Bubke [Wed, 26 May 2010 14:03:38 +0000 (16:03 +0200)]
If you move a new item on the formeditor the item is always in the base
state
The position is now setted int the base state if you drop a item on the
formeditor and move it around.
Task-Number: BAUHAUS-644
Reviewed-by: kkoehne
Kai Koehne [Thu, 20 May 2010 14:06:31 +0000 (16:06 +0200)]
QuickDesigner: Fix last (?) occurence of 4.6 as version of Qt namespace
Reviewed-by: Thomas Hartmann
Robert Loehning [Fri, 28 May 2010 18:48:35 +0000 (20:48 +0200)]
Added missing colons in German translation
Reviewed-by: Alessandro Portale
Leena Miettinen [Fri, 28 May 2010 15:11:25 +0000 (17:11 +0200)]
Doc - Add firmware release for Nokia N900 software update 1.2. Update information about Maemo Emulator build target.
Leena Miettinen [Fri, 28 May 2010 15:10:03 +0000 (17:10 +0200)]
Doc - Add tutorials on building and running example applications and creating mobile applications.
Reviewed-by: Christian Kamm
Leena Miettinen [Fri, 28 May 2010 15:07:44 +0000 (17:07 +0200)]
Doc - Update the run settings for desktop, Symbian, and Maemo.
Leena Miettinen [Fri, 28 May 2010 13:14:22 +0000 (15:14 +0200)]
Doc - In New project wizard, OK button label was changed to Choose.
Leena Miettinen [Fri, 28 May 2010 13:12:25 +0000 (15:12 +0200)]
Doc - Fix links to Qt reference docs to point to the latest versions.
Leena Miettinen [Thu, 27 May 2010 14:13:43 +0000 (16:13 +0200)]
Doc - Fix a bug.
Task-number: QTCREATORBUG-1491
Kai Koehne [Thu, 20 May 2010 11:14:08 +0000 (13:14 +0200)]
QuickDesigner: Make metainfo system robust for different version numbers
With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.
This commit includes several changes by Marco Bubke.
Reviewed-by: Marco Bubke
Marco Bubke [Tue, 18 May 2010 14:38:09 +0000 (16:38 +0200)]
Load plugins at the beginning of the meta info initializing
Reviewed-by: kkoehne
Friedemann Kleint [Fri, 28 May 2010 13:58:55 +0000 (15:58 +0200)]
Qt Designer integration: Fix Help button in stylesheet editor.
Wire QDesignerIntegration's help signal to help manager.
Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>
Thorbjørn Lindeijer [Fri, 28 May 2010 12:06:57 +0000 (14:06 +0200)]
Make sure bookmarks survive a document reload
While reloading a text document, the bookmarks got lost since their
associated QTextBlocks were deleted.
This patch makes sure that before reloading, the bookmarks are removed
non-persistently in the same way as when closing a document, and that
they are restored after the document was reloaded.
Currently, no effort is made to update the location of the bookmarks
based on the way the file changed.
Task-number: QTCREATORBUG-1281
Reviewed-by: dt
Christian Kamm [Fri, 28 May 2010 13:22:50 +0000 (15:22 +0200)]
QmlJS: Update builtin type definitions.
Qt.labs.gestures and Qt.labs.filelistmodel weren't dumped before,
Qt.multimedia and Qt.widgets are gone.
Task-number: QTCREATORBUG-1507
Reviewed-by: Roberto Raggi
Kai Koehne [Fri, 28 May 2010 11:45:53 +0000 (13:45 +0200)]
Fix crashes when loading large .qmlproject's (Mac OS X)
There is a hard limit on the number of file handles that can be open at one point per process on Mac OS X (e.g. it's 2560 on Mac OS X Snow Leopard Server, as shown by ulimit -a). Opening one or several .qmlproject's with a large number of directories to watch easily exceeds this. The results are crashes later on, e.g. when threads cannot be created any more.
This patch implements a heuristic that the file system watcher used for .qmlproject files never uses more than half the number of available file handles. It also increases the number from rlim_cur to rlim_max - the old code in main.cpp failed, see last section in
http://developer.apple.com/maac/library/documentation/Darwin/Reference/ManPages/man2/setrlimit.2.html
for details.
Reviewed-by: ckamm
Task-number: QTCREATORBUG-1487
Task-number: QTCREATORBUG-1486
Erik Verbruggen [Fri, 28 May 2010 10:15:54 +0000 (12:15 +0200)]
Disabled invalid ObjC++ discovery code.
Task-number: QTCREATORBUG-1501
Reviewed-by: Roberto Raggi
Robert Loehning [Thu, 27 May 2010 19:23:44 +0000 (21:23 +0200)]
Don't call QDirIterator::filePath() twice
hjk [Thu, 27 May 2010 15:27:35 +0000 (17:27 +0200)]
debugger: std::basic_string's refcount can be -1.
Reviewed-By: Oswald Buddenhagen
dt [Thu, 27 May 2010 14:36:26 +0000 (16:36 +0200)]
Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
Thorbjørn Lindeijer [Thu, 27 May 2010 14:07:52 +0000 (16:07 +0200)]
Fixed the default UI color
When there was no existing configuration, it would get set to pure black
on startup, resulting in a very dark gray Qt Creator. Now it is back to
its old friendly gray as default color.
Also made sure that the default on startup and the color used for
resetting the UI color in the settings are always in sync.
Reviewed-by: Jens Bache-Wiig
hjk [Thu, 27 May 2010 13:41:52 +0000 (15:41 +0200)]
debugger: more robust version string parsing
Fix for QTCREATORBUG-1490
Reviewed-By: Friedemann Kleint
Jarek Kobus [Thu, 27 May 2010 13:29:00 +0000 (15:29 +0200)]
Update Polish translations