OSDN Git Service
Leena Miettinen [Wed, 16 Jun 2010 09:41:21 +0000 (11:41 +0200)]
Doc - Add information about Remote Compiler. Add information about building for Symbian Emulator.
Reviewed-by: Tobias Hunger
Kai Koehne [Tue, 15 Jun 2010 13:39:53 +0000 (15:39 +0200)]
QuickDesigner: Compile fix
Fix compilation error introduced by a rebase
(
12d6f03d5f219599b4f708ea15a31c3b673d0241)
Kai Koehne [Thu, 6 May 2010 13:37:08 +0000 (15:37 +0200)]
QuickDesigner: Reduce numbers of redraws / state switching in States Editor
nodeInstancePropertyChanged() is called for _every_ state switch ... so
the current assumption that it only reflects real changes does not hold.
Instead, use the orphaned sceneChanged() method to schedule redraws.
However, this still results in some overhead when switching to the base state
(sceneChanged() cannot decide whether it has to redraw all other states
or not).
Reviewed-by: Christiaan Janssen
Kai Koehne [Thu, 6 May 2010 12:04:24 +0000 (14:04 +0200)]
QuickDesigner: Add debugging output to track State Switching
Of course disabled by default
Reviewed-by: Christiaan Janssen
dt [Tue, 15 Jun 2010 12:44:15 +0000 (14:44 +0200)]
Fix parsing canceld on project load
Task-Nr: QTCREATORBUG-1616
Daniel Molkentin [Tue, 15 Jun 2010 12:45:14 +0000 (14:45 +0200)]
Sync doc style with Qt, introduce online version (make docs_online)
The spacing errors come from Qt, and should be fixed there.
Reviewed-By: Oswald Buddenhagen
Christian Kamm [Tue, 15 Jun 2010 12:50:16 +0000 (14:50 +0200)]
QmlJS: Ignore .pragma library for now.
Task-number: QTCREATORBUG-1421
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 15 Jun 2010 12:34:18 +0000 (14:34 +0200)]
QmlJS: Don't unnecessarily store the multiline comment state.
The 'state' value already holds the same information.
Reviewed-by: Erik Verbruggen
(backport of
70448b016d5a5071cd827c5fd64d8ea66a59e65a)
Thorbjørn Lindeijer [Tue, 15 Jun 2010 10:07:15 +0000 (12:07 +0200)]
Avoid triggering indent for electric characters in comments and strings
In comments and strings, electric characters have no syntactical
significance and the unnecessary automatic reindent can be annoying.
Reviewed-by: Erik Verbruggen
Thorbjørn Lindeijer [Tue, 15 Jun 2010 08:44:07 +0000 (10:44 +0200)]
Fixed handling of text wrapping and a text layout corner case
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.
In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.
Reviewed-by: mae
Friedemann Kleint [Tue, 15 Jun 2010 09:57:05 +0000 (11:57 +0200)]
VCS[Mercurial]: Working directory not set for asynchronous commands.
Task-number: QTCREATORBUG-1503
Friedemann Kleint [Tue, 15 Jun 2010 09:41:43 +0000 (11:41 +0200)]
VCS[Mercurial]: Remove LANG=C setting
as it breaks the log output.
Task-number: QTCREATORBUG-1623
Friedemann Kleint [Tue, 15 Jun 2010 09:38:09 +0000 (11:38 +0200)]
VCS[Subversion]: Remove LANG=C setting
as it breaks the log output.
Task-number: QTCREATORBUG-1623
Erik Verbruggen [Tue, 15 Jun 2010 09:26:27 +0000 (11:26 +0200)]
Added C-style comment folding.
This is a "back-port" for
57f2b3e44da5ca818d575b2c5861f736aa3db0bc from master
into 2.0.
Done-with: ckamm
Kai Koehne [Fri, 11 Jun 2010 06:46:32 +0000 (08:46 +0200)]
QmlDesigner: Fix crash when typing keywords as Ids
We don't check that an ID entered in the Navigator or Property Editor
is not a JavaScript keyword. This patch revamps the RewritingException
that happens in this case in a InvalidIdException.
Task-number: QTCREATORBUG-1540
kh1 [Mon, 14 Jun 2010 16:07:20 +0000 (18:07 +0200)]
Fixes broken attribute list for real.
Task-number: QTCREATORBUG-1621
kh1 [Mon, 14 Jun 2010 14:57:26 +0000 (16:57 +0200)]
Fix build without webkit.
kh1 [Mon, 14 Jun 2010 14:55:58 +0000 (16:55 +0200)]
We need to check for http only.
Thorbjørn Lindeijer [Mon, 14 Jun 2010 14:06:42 +0000 (16:06 +0200)]
Don't pass QChar as const & since it's just a unsigned short
Reviewed-by: ogoffart
kh1 [Mon, 14 Jun 2010 12:31:34 +0000 (14:31 +0200)]
Allow http request to be opened in the help plugin.
Reviewed-by: ck
Sergey Belyashov [Mon, 14 Jun 2010 11:39:35 +0000 (13:39 +0200)]
Russian translation update
Merge-request: 150
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
con [Fri, 11 Jun 2010 14:37:10 +0000 (16:37 +0200)]
Version update to match the planned version naming.
con [Fri, 11 Jun 2010 13:33:11 +0000 (15:33 +0200)]
Fixes: Not possible to tell whether "Operate by instruction" is enabled
from Menu entry
Don't show the icon of checkable items in the menu to avoid being
affected by broken styles.
Task-number: QTCREATORBUG-1173
con [Fri, 11 Jun 2010 12:48:08 +0000 (14:48 +0200)]
Fixes: Menu items disabled during keyboard navigation (Windows)
Reviewed-by: Thorbjørn Lindeijer
Task-number: QTCREATORBUG-865
Leena Miettinen [Fri, 11 Jun 2010 12:21:45 +0000 (14:21 +0200)]
Doc - Added fixed issues in 2.0.0 that were removed from known issues in Qt Creator manual.
Reviewed-by: con
Leena Miettinen [Thu, 10 Jun 2010 15:33:16 +0000 (17:33 +0200)]
Doc - Removed fixed or obsolete issues and added a new issue for v2.0.0.
Reviewed-by: con
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
kh1 [Fri, 11 Jun 2010 11:11:37 +0000 (13:11 +0200)]
Move help manager into core.
- lessens open file handles
- improves help plugin startup further
Task-number: QTCREATORBUG-337
Reviewed-by: ck
kh1 [Fri, 11 Jun 2010 10:49:19 +0000 (12:49 +0200)]
Fix missing check-boxes on initial startup.
Task-number: QTCREATORBUG-1621
Reviewed-by: ck
ck [Fri, 11 Jun 2010 09:58:12 +0000 (11:58 +0200)]
Maemo: Make packaging step optional.
Reviewed-by: kh1
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
dt [Thu, 10 Jun 2010 16:04:31 +0000 (18:04 +0200)]
Fix double output in compile output window
dt [Thu, 10 Jun 2010 16:02:38 +0000 (18:02 +0200)]
Fix escaped output in the compile output window
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.
Marco Bubke [Thu, 10 Jun 2010 14:31:26 +0000 (16:31 +0200)]
Don't overwrite bindings
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
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
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
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
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.
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.
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
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
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
dt [Thu, 10 Jun 2010 12:48:59 +0000 (14:48 +0200)]
Remove Qt4 runconfigurations again which don't work.
Task-Nr: QTCREATORBUG-1593
dt [Thu, 10 Jun 2010 12:18:20 +0000 (14:18 +0200)]
Fix comment
dt [Wed, 9 Jun 2010 13:21:44 +0000 (15:21 +0200)]
Don't reset build directory for clone cmake buildconfigurations
dt [Wed, 9 Jun 2010 13:08:06 +0000 (15:08 +0200)]
Make code thread safe again.
dt [Wed, 9 Jun 2010 13:07:41 +0000 (15:07 +0200)]
Fix message shown on building
Leena Miettinen [Thu, 10 Jun 2010 12:30:31 +0000 (14:30 +0200)]
Doc - Fixed punctuation.
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
Leena Miettinen [Thu, 10 Jun 2010 12:27:40 +0000 (14:27 +0200)]
Doc - Update screen shots and related text.
Leena Miettinen [Thu, 10 Jun 2010 12:26:33 +0000 (14:26 +0200)]
Doc - Replace S60 with Symbian.
Leena Miettinen [Mon, 7 Jun 2010 13:17:15 +0000 (15:17 +0200)]
Doc - Add workaround for installing files on Symbian devices.
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
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
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)
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
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
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.
Robert Loehning [Wed, 9 Jun 2010 14:53:56 +0000 (16:53 +0200)]
Cleaned up calls to parent class's functions
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
Kai Koehne [Wed, 9 Jun 2010 07:59:27 +0000 (09:59 +0200)]
QmlDesigner: Removing unreachable code
Pointed out by static code analysis.
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
dt [Wed, 9 Jun 2010 11:20:45 +0000 (13:20 +0200)]
Fix: Removing of last buildstep not possible after building
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
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
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
Oswald Buddenhagen [Tue, 8 Jun 2010 11:57:23 +0000 (13:57 +0200)]
micro-optimizations
Robert Loehning [Tue, 8 Jun 2010 16:22:23 +0000 (18:22 +0200)]
Fix warning
dt [Tue, 8 Jun 2010 15:36:47 +0000 (17:36 +0200)]
Make the TaskView 10% faster by caching how wide "8888" is.
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
dt [Tue, 8 Jun 2010 15:18:53 +0000 (17:18 +0200)]
Optimize the taskCount tracking
Saving another 20%
dt [Tue, 8 Jun 2010 13:38:59 +0000 (15:38 +0200)]
Make clearing the build issue list way faster
dt [Tue, 8 Jun 2010 14:01:48 +0000 (16:01 +0200)]
Fix unused parameter warning
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
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
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
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
dt [Tue, 8 Jun 2010 09:57:50 +0000 (11:57 +0200)]
Make TaskModel 2.5x faster
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
dt [Mon, 7 Jun 2010 15:22:16 +0000 (17:22 +0200)]
Don't remove directories that were added multiple times
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
Friedemann Kleint [Tue, 8 Jun 2010 11:57:28 +0000 (13:57 +0200)]
Fix uic warning.
Thorbjørn Lindeijer [Mon, 7 Jun 2010 13:10:36 +0000 (15:10 +0200)]
Removed no longer used code
Reviewed-by: mae
mae [Tue, 8 Jun 2010 10:52:07 +0000 (12:52 +0200)]
Fix PropertyAction snippet
Reviewed-by: thorbjorn
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
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
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
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.
Robert Loehning [Mon, 7 Jun 2010 15:23:50 +0000 (17:23 +0200)]
Adjusting size of Combo for selecting COM-port of Symbian device
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>
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>
Robert Loehning [Mon, 7 Jun 2010 12:47:40 +0000 (14:47 +0200)]
Symbian/trk: Don't try to dereference references
dt [Mon, 7 Jun 2010 13:01:51 +0000 (15:01 +0200)]
Direct connection for build parsers
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