OSDN Git Service

qt-creator-jp/qt-creator-jp.git
14 years agonon-python: fix dumping of structs inside qt containers
Oswald Buddenhagen [Thu, 10 Jun 2010 15:58:23 +0000 (17:58 +0200)]
non-python: fix dumping of structs inside qt containers

Reviewed-by: hjk
14 years agoFix double output in compile output window
dt [Thu, 10 Jun 2010 16:04:31 +0000 (18:04 +0200)]
Fix double output in compile output window

14 years agoFix escaped output in the compile output window
dt [Thu, 10 Jun 2010 16:02:38 +0000 (18:02 +0200)]
Fix escaped output in the compile output window

14 years agoGet in component and connect every signal to the signal watcher
Marco Bubke [Wed, 9 Jun 2010 12:52:33 +0000 (14:52 +0200)]
Get in component and connect every signal to the signal watcher

This is improving the updating.

14 years agoDon't overwrite bindings
Marco Bubke [Thu, 10 Jun 2010 14:31:26 +0000 (16:31 +0200)]
Don't overwrite bindings

14 years agoQmlDesigner: Switch 'only select items with content' off by default
Kai Koehne [Wed, 9 Jun 2010 13:18:59 +0000 (15:18 +0200)]
QmlDesigner: Switch 'only select items with content' off by default

Reviewed-by: Marco Bubke
Task-id: QTCREATORBUG-1493

14 years agoAdd script function to the model
Marco Bubke [Thu, 10 Jun 2010 15:36:14 +0000 (17:36 +0200)]
Add script function to the model

This is needed to suppert inline script function of Qml in the designer

14 years agofix wildcard expansion, etc. under windows
Oswald Buddenhagen [Thu, 10 Jun 2010 15:03:02 +0000 (17:03 +0200)]
fix wildcard expansion, etc. under windows

raw strings would break things due to the missing null terminator. this
did not affect unix, as there we convert to 8 bit anyway.

Task-number: QTCREATORBUG-1364

14 years agoVCS[svn]: Incomplete environment passed to Subversion process.
Friedemann Kleint [Thu, 10 Jun 2010 14:20:01 +0000 (16:20 +0200)]
VCS[svn]: Incomplete environment passed to Subversion process.

Fixes breakage introduced by 34982c1f2361be0428a00007e7b0dea310a0b315.
Task-number: QTCREATORBUG-1612
Reviewed-by: dt
14 years agoQmlDesigner: Add missing imports when doing drag&drop from the library
Kai Koehne [Thu, 10 Jun 2010 11:02:45 +0000 (13:02 +0200)]
QmlDesigner: Add missing imports when doing drag&drop from the library

Fixes a crash when drag&dropping e.g. the WebView element to a file
which doesn't already import the org.webkit package.

14 years agoRevert "QmlDesigner: crash fix for copy and paste"
Kai Koehne [Thu, 10 Jun 2010 10:03:43 +0000 (12:03 +0200)]
Revert "QmlDesigner: crash fix for copy and paste"

Enable correct handling of imports again.
This reverts commit de610cac45f227d7c15015000d6e32d5dc614e09.

14 years agoQuickDesigner: Automatically use alias of namespace in Rewriter
Kai Koehne [Thu, 10 Jun 2010 11:36:45 +0000 (13:36 +0200)]
QuickDesigner: Automatically use alias of namespace in Rewriter

E.g. if the type of the node is 'Qt/Image', version 4, 6, search through
the list of imports to find 'Qt'. If an alias for the namespace has been
defined, prepend this to the element name.

Reviewed-by: Erik Verbruggen
14 years agoQmlDesigner: Fix import handling in rewriter
Kai Koehne [Thu, 10 Jun 2010 09:58:23 +0000 (11:58 +0200)]
QmlDesigner: Fix import handling in rewriter

Task-number: BAUHAUS-602
Reviewed-by: Erik Verbruggen
14 years agoQmlDesigner: Store imports in a list, not a set
Kai Koehne [Thu, 10 Jun 2010 09:55:40 +0000 (11:55 +0200)]
QmlDesigner: Store imports in a list, not a set

The order of imports does matter, therefore it should also be
represented as a list in the model.

Reviewed-by: Marco Bubke
14 years agoRemove Qt4 runconfigurations again which don't work.
dt [Thu, 10 Jun 2010 12:48:59 +0000 (14:48 +0200)]
Remove Qt4 runconfigurations again which don't work.

Task-Nr: QTCREATORBUG-1593

14 years agoFix comment
dt [Thu, 10 Jun 2010 12:18:20 +0000 (14:18 +0200)]
Fix comment

14 years agoDon't reset build directory for clone cmake buildconfigurations
dt [Wed, 9 Jun 2010 13:21:44 +0000 (15:21 +0200)]
Don't reset build directory for clone cmake buildconfigurations

14 years agoMake code thread safe again.
dt [Wed, 9 Jun 2010 13:08:06 +0000 (15:08 +0200)]
Make code thread safe again.

14 years agoFix message shown on building
dt [Wed, 9 Jun 2010 13:07:41 +0000 (15:07 +0200)]
Fix message shown on building

14 years agoDoc - Fixed punctuation.
Leena Miettinen [Thu, 10 Jun 2010 12:30:31 +0000 (14:30 +0200)]
Doc - Fixed punctuation.

14 years agoDoc - Add information about testing with user data on the Nokia N900.
Leena Miettinen [Thu, 10 Jun 2010 12:29:45 +0000 (14:29 +0200)]
Doc - Add information about testing with user data on the Nokia N900.

Reviewed-by: Christian Kamm
14 years agoDoc - Update screen shots and related text.
Leena Miettinen [Thu, 10 Jun 2010 12:27:40 +0000 (14:27 +0200)]
Doc - Update screen shots and related text.

14 years agoDoc - Replace S60 with Symbian.
Leena Miettinen [Thu, 10 Jun 2010 12:26:33 +0000 (14:26 +0200)]
Doc - Replace S60 with Symbian.

14 years agoDoc - Add workaround for installing files on Symbian devices.
Leena Miettinen [Mon, 7 Jun 2010 13:17:15 +0000 (15:17 +0200)]
Doc - Add workaround for installing files on Symbian devices.

14 years agoDoc - Add information about installing Qt Mobility API libraries on Nokia N900.
Leena Miettinen [Mon, 7 Jun 2010 13:16:36 +0000 (15:16 +0200)]
Doc - Add information about installing Qt Mobility API libraries on Nokia N900.

Reviewed-by: Niels Weber
Reviewed-by: Tim Jenssen
14 years agoFixed id syncing when and id gets removed from the QML source.
Erik Verbruggen [Thu, 10 Jun 2010 09:18:14 +0000 (11:18 +0200)]
Fixed id syncing when and id gets removed from the QML source.

Task-number: BAUHAUS-780
Reviewed-by: kkoehne
14 years agoFix targetsetuppage's shadowbuild dirs
Tobias Hunger [Tue, 8 Jun 2010 12:19:05 +0000 (14:19 +0200)]
Fix targetsetuppage's shadowbuild dirs

 * Fix displayed shadow build location
 * Fix shadow build location used by newly set up shadow builds

Task-number: QTCREATORBUG-1599
Reviewed-by: dt
(cherry picked from commit 1d8e176067c48705cdfd746e2c1fb23539f58a8e)

14 years agoQmlDesigner: Add test case for Rewriter not removing Ids form model
Kai Koehne [Thu, 10 Jun 2010 08:25:16 +0000 (10:25 +0200)]
QmlDesigner: Add test case for Rewriter not removing Ids form model

Task-number: BAUHAUS-780

14 years agoQmlProject: Consistently enable/disable debug & run buttons
Kai Koehne [Thu, 10 Jun 2010 07:10:11 +0000 (09:10 +0200)]
QmlProject: Consistently enable/disable debug & run buttons

The heuristics to find the file to run and the logic that decides
whether the show / debug button is shown weren't in sync. Also, don't
try to run .qmlproject files if open in the editor.

Reviewed-by: Lasse Holmstedt
14 years agodon't link to the jom project page but to the download location
Joerg Bornemann [Thu, 10 Jun 2010 08:04:19 +0000 (10:04 +0200)]
don't link to the jom project page but to the download location

On the project page isn't much information for the end user.

14 years agoCleaned up calls to parent class's functions
Robert Loehning [Wed, 9 Jun 2010 14:53:56 +0000 (16:53 +0200)]
Cleaned up calls to parent class's functions

14 years agoFix crash when loading a .qmlproject with a custom run configuration
Kai Koehne [Wed, 9 Jun 2010 14:22:27 +0000 (16:22 +0200)]
Fix crash when loading a .qmlproject with a custom run configuration

Task-number: QTCREATORBUG-1609

14 years agoQmlDesigner: Removing unreachable code
Kai Koehne [Wed, 9 Jun 2010 07:59:27 +0000 (09:59 +0200)]
QmlDesigner: Removing unreachable code

Pointed out by static code analysis.

14 years agoCmake: Don't delete run configurations on switching buildconfigurations
dt [Wed, 9 Jun 2010 11:21:08 +0000 (13:21 +0200)]
Cmake: Don't delete run configurations on switching buildconfigurations

Just disable them, but preserve them. This is different from qmake, but
for qmake we do have different assumptions what a buildconfiguration is.

Task-Nr: QTCREATORBUG-1591

14 years agoFix: Removing of last buildstep not possible after building
dt [Wed, 9 Jun 2010 11:20:45 +0000 (13:20 +0200)]
Fix: Removing of last buildstep not possible after building

14 years agoFileIconProvider calling itself instead of a second object.
Robert Loehning [Wed, 9 Jun 2010 10:58:16 +0000 (12:58 +0200)]
FileIconProvider calling itself instead of a second object.

Reviewed-by: Friedemann Kleint
14 years agotry to sort out the filename encoding mess
Oswald Buddenhagen [Tue, 8 Jun 2010 15:49:09 +0000 (17:49 +0200)]
try to sort out the filename encoding mess

use local8bit instead of latin1 resp. 8bit-passthrough, after all.

the situation was as follows:
- if the pro files and file names were all ascii, everything just worked
- if either contained non-ascii:
  - on unix, the evaluator would work as long as the file content
    encoding matched the file name encoding, and the ui would work as
    long as the file name encoding was latin1 (i.e., on no modern
    system)
  - on windows, both would work only if the ansi code page was
    latin1/cp1252 (i.e., on western systems)

i.e., even in the low-level evaluator, only native latin1 systems with
actual latin1 files worked consistently. given this situation, it makes
little sense to make an encoding adapter between the evaluator and the
ui as originally planned. instead, take the easy way out and use
local8bit - this continues to work for native latin1 systems+files in
the backend, and makes the ui work for everything the backend groks and
some more.

Reviewed-by: dt
Task-number: QTCREATORBUG-930

14 years agoconsolidate the subdir name data path
Oswald Buddenhagen [Tue, 8 Jun 2010 12:02:15 +0000 (14:02 +0200)]
consolidate the subdir name data path

every path should be separator-fixed

Reviewed-by: dt
14 years agomicro-optimizations
Oswald Buddenhagen [Tue, 8 Jun 2010 11:57:23 +0000 (13:57 +0200)]
micro-optimizations

14 years agoFix warning
Robert Loehning [Tue, 8 Jun 2010 16:22:23 +0000 (18:22 +0200)]
Fix warning

14 years agoMake the TaskView 10% faster by caching how wide "8888" is.
dt [Tue, 8 Jun 2010 15:36:47 +0000 (17:36 +0200)]
Make the TaskView 10% faster by caching how wide "8888" is.

14 years agoFixed showing the proper path in prompt to overwrite msg box
Jarek Kobus [Tue, 8 Jun 2010 15:33:37 +0000 (17:33 +0200)]
Fixed showing the proper path in prompt to overwrite msg box

Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-1601

14 years agoOptimize the taskCount tracking
dt [Tue, 8 Jun 2010 15:18:53 +0000 (17:18 +0200)]
Optimize the taskCount tracking

Saving another 20%

14 years agoMake clearing the build issue list way faster
dt [Tue, 8 Jun 2010 13:38:59 +0000 (15:38 +0200)]
Make clearing the build issue list way faster

14 years agoFix unused parameter warning
dt [Tue, 8 Jun 2010 14:01:48 +0000 (16:01 +0200)]
Fix unused parameter warning

14 years agoQuickDesigner.itemLibrary: enable mouse wheel interaction in items view
Jörg Schummer [Mon, 31 May 2010 12:27:52 +0000 (15:27 +0300)]
QuickDesigner.itemLibrary: enable mouse wheel interaction in items view

Task-number: BAUHAUS-657

14 years agoQmlDesigner: Prevent freezing while doing drag&drop on some Windows
Kai Koehne [Tue, 8 Jun 2010 14:43:29 +0000 (16:43 +0200)]
QmlDesigner: Prevent freezing while doing drag&drop on some Windows
systems

QWidget::grabMouse() might freeze if there are e.g. misbehaving virus
scanners installed. This is why e.g. qdockwidget.cpp doesn't use
grabMouse(), but QWidgetPrivate::grabMouseWhileInWindow().

As a hot fix we do the very same now in creator, at the cost of
including the private header qwidget_p.h.

Task-number: BAUHAUS-772
Task-number: QTBUG-11301

14 years agoQmlJS: Avoid infinite recursion when encountering property loops.
Christian Kamm [Tue, 8 Jun 2010 13:36:06 +0000 (15:36 +0200)]
QmlJS: Avoid infinite recursion when encountering property loops.

Such as
property int foo: bar
property int bar: foo.

Task-number: QTCREATORBUG-1389
Reviewed-by: Roberto Raggi
14 years agoPort the compile output window away from HTML to QTextCharFormat
dt [Tue, 8 Jun 2010 13:04:42 +0000 (15:04 +0200)]
Port the compile output window away from HTML to QTextCharFormat

Is more then twice as fast

14 years agoMake TaskModel 2.5x faster
dt [Tue, 8 Jun 2010 09:57:50 +0000 (11:57 +0200)]
Make TaskModel 2.5x faster

14 years agoDisconnect the output parser on taking it out of the chain
dt [Mon, 7 Jun 2010 15:27:24 +0000 (17:27 +0200)]
Disconnect the output parser on taking it out of the chain

Reviewed-By: hunger
14 years agoDon't remove directories that were added multiple times
dt [Mon, 7 Jun 2010 15:22:16 +0000 (17:22 +0200)]
Don't remove directories that were added multiple times

14 years agoBug fix: Late crash when closing Creator while building debugging helper (QTCREATORBU...
Leandro Melo [Tue, 8 Jun 2010 11:55:50 +0000 (13:55 +0200)]
Bug fix: Late crash when closing Creator while building debugging helper (QTCREATORBUG-1576).

Reviewed-by: hjk
14 years agoFix uic warning.
Friedemann Kleint [Tue, 8 Jun 2010 11:57:28 +0000 (13:57 +0200)]
Fix uic warning.

14 years agoRemoved no longer used code
Thorbjørn Lindeijer [Mon, 7 Jun 2010 13:10:36 +0000 (15:10 +0200)]
Removed no longer used code

Reviewed-by: mae
14 years agoFix PropertyAction snippet
mae [Tue, 8 Jun 2010 10:52:07 +0000 (12:52 +0200)]
Fix PropertyAction snippet

Reviewed-by: thorbjorn
14 years agohide includes from within feature files
Oswald Buddenhagen [Mon, 7 Jun 2010 19:25:11 +0000 (21:25 +0200)]
hide includes from within feature files

this fixes the recent appearance of qt_webkit_version.pri in all qt 4.7
based projects.

in fact, the patch does somewhat more: it makes the evaluator provide
the information to the higher layers which is necessary for a truly
hierarchical display of includes. TBD later.

Reviewed-by: dt
Task-number: QTCREATORBUG-1590

14 years agoImproved gradient editor
Jens Bache-Wiig [Mon, 7 Jun 2010 18:52:54 +0000 (20:52 +0200)]
Improved gradient editor

Cosmetic:
I tweaked the colors, added shadows, highlights and introduced
anti-aliasing where suitable.

Behavior:
I now delay emitting the colorChanged signal until you have
released the mouse button on the color picker. This makes
the application feel a lot more responsive.

Reviewed-by: thorbjorn
14 years agoAdd drop shadow to project settings
Jens Bache-Wiig [Fri, 7 May 2010 14:48:33 +0000 (16:48 +0200)]
Add drop shadow to project settings

I added a second drop shadow to make the panel a bit nicer.
This also makes it clearer what the scrollbar does.

Reviewed-by:thorbjorn

14 years agoRevert disabling of qml support (2.0.0 branch)
Kai Koehne [Mon, 7 Jun 2010 11:42:27 +0000 (13:42 +0200)]
Revert disabling of qml support (2.0.0 branch)

This reverts commit 5234c775f765a and 210652912b728e9c.

14 years agoAdjusting size of Combo for selecting COM-port of Symbian device
Robert Loehning [Mon, 7 Jun 2010 15:23:50 +0000 (17:23 +0200)]
Adjusting size of Combo for selecting COM-port of Symbian device

14 years agoMime database: Make diff matching more strict.
Friedemann Kleint [Mon, 7 Jun 2010 13:34:56 +0000 (15:34 +0200)]
Mime database: Make diff matching more strict.

Match at beginning of line.
Task-number: QTCREATORBUG-1526
Reviewed-by: thorbjorn <thorbjorn.lindeijer@nokia.com>
14 years agoSymbian/trk: Fixed handling of partial frames
Robert Loehning [Mon, 7 Jun 2010 12:58:24 +0000 (14:58 +0200)]
Symbian/trk: Fixed handling of partial frames

Initial-patch-by: Shane Kearns <shane.kearns@accenture.com>
14 years agoSymbian/trk: Don't try to dereference references
Robert Loehning [Mon, 7 Jun 2010 12:47:40 +0000 (14:47 +0200)]
Symbian/trk: Don't try to dereference references

14 years agoDirect connection for build parsers
dt [Mon, 7 Jun 2010 13:01:51 +0000 (15:01 +0200)]
Direct connection for build parsers

14 years agoVCS/Diff editors: Set readonly attributes correctly.
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>
14 years agoVersion bump.
con [Mon, 7 Jun 2010 11:45:49 +0000 (13:45 +0200)]
Version bump.

14 years agodoc: adjust description of python dumper classes to reality
hjk [Mon, 7 Jun 2010 10:26:34 +0000 (12:26 +0200)]
doc: adjust description of python dumper classes to reality

14 years agoFixed invalid and unreachable code.
Erik Verbruggen [Mon, 7 Jun 2010 10:16:09 +0000 (12:16 +0200)]
Fixed invalid and unreachable code.

Reviewed-by: holmstedt
14 years agoFix crash on session restore
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.

14 years agoSymbian/Trk: Don't try to download a file without respective flag set.
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
14 years agoAllow F1 on projects mode
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
14 years agoFix session dialog help link
Daniel Molkentin [Mon, 7 Jun 2010 09:15:02 +0000 (11:15 +0200)]
Fix session dialog help link

Reviewed-By: Leena Miettinen
14 years agoFix F1 on welcome page
Daniel Molkentin [Mon, 7 Jun 2010 09:14:19 +0000 (11:14 +0200)]
Fix F1 on welcome page

Reviewed-By: kh1
14 years agoFixed disabled checkbox styles for plugin manager
Lasse Holmstedt [Mon, 7 Jun 2010 08:25:39 +0000 (10:25 +0200)]
Fixed disabled checkbox styles for plugin manager

Reviewed-by: jbache
14 years agodisable outdated and known bad translations
Oswald Buddenhagen [Fri, 4 Jun 2010 17:14:18 +0000 (19:14 +0200)]
disable outdated and known bad translations

14 years agomake the evaluator (even more) thread-safe
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

14 years agoadd "static"
Oswald Buddenhagen [Fri, 4 Jun 2010 14:58:23 +0000 (16:58 +0200)]
add "static"

14 years agoDoc - Avoid warnings in doc.
Robert Loehning [Fri, 4 Jun 2010 14:55:47 +0000 (16:55 +0200)]
Doc - Avoid warnings in doc.

Reviewed-by: Leena Miettinen
14 years agoDoc - Update screen shots.
Leena Miettinen [Fri, 4 Jun 2010 13:13:08 +0000 (15:13 +0200)]
Doc - Update screen shots.

14 years agoDoc - Update information about managing sessions and screenshots.
Leena Miettinen [Fri, 4 Jun 2010 13:12:47 +0000 (15:12 +0200)]
Doc - Update information about managing sessions and screenshots.

Reviewed-by: dt
14 years agoDoc - Add note about finding out the Symbian platform version on a device for TRK...
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
14 years agoDoc - Add link to platform notes.
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
14 years agoDoc - Update CMake screenshots and edit related text.
Leena Miettinen [Fri, 4 Jun 2010 09:18:09 +0000 (11:18 +0200)]
Doc - Update CMake screenshots and edit related text.

14 years agoDoc - Update Locator screen shots and modify related text.
Leena Miettinen [Fri, 4 Jun 2010 09:17:22 +0000 (11:17 +0200)]
Doc - Update Locator screen shots and modify related text.

14 years agoRevert "Add missing style sheet"
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.

14 years agoAdd missing style sheet
Daniel Molkentin [Fri, 4 Jun 2010 12:57:05 +0000 (14:57 +0200)]
Add missing style sheet

Reviewed-by: Leena Miettinen
14 years agoFix mobile example link
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
14 years agoFix help being unusable in split mode by using Qt doc offline style
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
14 years agoFix cursor positioning for up/down after backspace
mae [Fri, 4 Jun 2010 11:39:31 +0000 (13:39 +0200)]
Fix cursor positioning for up/down after backspace

Reviewed-by: Roberto Raggi
14 years agoMaemo: Adapt qemu path for Harmattan.
ck [Fri, 4 Jun 2010 11:12:47 +0000 (13:12 +0200)]
Maemo: Adapt qemu path for Harmattan.

Reviewed-by: kh1
14 years agoMention QTCREATOR_WITH_QML environment variable in README
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
14 years agoTwo descriptions in the file new dialog were swapped
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
14 years agofakevim: fix cursor keys on Mac.
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.

14 years agoQuickDesigner: Fix core test
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.

14 years agoQuickDesigner: Fix compilation of QuickDesigner/core tests
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
14 years agofakevim: clear opcount and mvcount on escape
hjk [Fri, 4 Jun 2010 07:07:09 +0000 (09:07 +0200)]
fakevim: clear opcount and mvcount on escape

14 years agoUpdate the doc style from Qt
Daniel Molkentin [Thu, 3 Jun 2010 18:01:19 +0000 (20:01 +0200)]
Update the doc style from Qt

Reviewed-by: Oswald Buddenhagen
14 years agoFix an issue with 'make ts' when CUSTOMWIZARDS_FILES is empty.
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)

14 years agoMake the QmlJSEditor work when Qml support is disabled.
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