OSDN Git Service
Tobias Hunger [Fri, 8 Oct 2010 08:56:31 +0000 (10:56 +0200)]
VCS: String update
String update as suggested by Leena.
Tobias Hunger [Thu, 7 Oct 2010 13:42:32 +0000 (15:42 +0200)]
Git: Clean up the menu of the git plugin
Tobias Hunger [Thu, 7 Oct 2010 13:42:03 +0000 (15:42 +0200)]
Git: Show native pathes to repositories
Tobias Hunger [Thu, 7 Oct 2010 09:14:20 +0000 (11:14 +0200)]
Qt4: Use native pathes in qmake arguments
Use native pathes in qmake arguments.
Tobias Hunger [Wed, 6 Oct 2010 16:08:30 +0000 (18:08 +0200)]
VCS: raise submit editor to the front when prompting
Bring the submit to the front when asking whether the change should
get committed or not. This is useful when e.g. closing creator
while a submiteditor is open somewhere (but not visible).
Tobias Hunger [Wed, 6 Oct 2010 16:05:07 +0000 (18:05 +0200)]
Session: Do not save temporary editors
Do not save temporary editors in the session. Chances are high
that files opened in those editors are not around when the
session is reopened.
Task-number: QTCREATORBUG-2422
Tobias Hunger [Wed, 6 Oct 2010 15:50:27 +0000 (17:50 +0200)]
Git: Consider new files a diff
When checking for a difference and being asked to handle untracked
files: Actually consider the presence of untracked files a change.
Fixes git commit editor not coming up when there were no changes,
only additions of new files.
Tobias Hunger [Wed, 6 Oct 2010 14:11:07 +0000 (16:11 +0200)]
Environment: Disable escaping when expanding variables
This breaks too much on windows.
Reviewed-by: dt
hjk [Fri, 8 Oct 2010 12:26:44 +0000 (14:26 +0200)]
debugger: add python dumper for QFixed
Reviewed-by: Alessandro Portale
hjk [Thu, 7 Oct 2010 14:36:25 +0000 (16:36 +0200)]
debugger: test gcc RVO bug not too extensively
hjk [Thu, 7 Oct 2010 14:12:52 +0000 (16:12 +0200)]
debugger: python dumper for std::stack was tested but not implemented
Reviewed-by: Leandro Melo
Task-number: QTCREATORBUG-2665
hjk [Thu, 7 Oct 2010 13:34:37 +0000 (15:34 +0200)]
version bump: 2.0.92 -> 2.0.93
con [Fri, 8 Oct 2010 10:39:06 +0000 (12:39 +0200)]
Don't override user's shortcut settings for navigation panes at startup.
The action manager was reading the settings before the navigation panels
had their commands registered.
Task-number: QTCREATORBUG-2005
Reviewed-by: hjk
con [Fri, 8 Oct 2010 10:22:53 +0000 (12:22 +0200)]
File search wasn't showing non-latin1 chars correctly in results.
Missing conversion back to the codec. This fixes it only for Utf8
encoded files. It was only happening for non-regexp searches.
Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning
con [Thu, 7 Oct 2010 16:39:25 +0000 (18:39 +0200)]
Make text consistent.
Reviewed-by: Leena Miettinen
Erik Verbruggen [Thu, 7 Oct 2010 13:22:32 +0000 (15:22 +0200)]
C++: check for header file without corresponding source file in quickfix.
Reviewed-by: Christian Kamm
Erik Verbruggen [Wed, 6 Oct 2010 14:43:42 +0000 (16:43 +0200)]
C++: disable definition generation for pure virtual methods.
Erik Verbruggen [Wed, 6 Oct 2010 14:33:49 +0000 (16:33 +0200)]
C++: fixed translatable quick-fix strings.
Erik Verbruggen [Wed, 6 Oct 2010 14:26:48 +0000 (16:26 +0200)]
C++ Parser: fix infinite loop when recovering from incorrect @selector expression.
Erik Verbruggen [Wed, 6 Oct 2010 13:49:59 +0000 (15:49 +0200)]
C++ Editor: check for method existing decl/def when inserting new ones.
Erik Verbruggen [Wed, 6 Oct 2010 12:01:59 +0000 (14:01 +0200)]
C++ Editor: prevent insertion of method definitions in header files.
Erik Verbruggen [Wed, 6 Oct 2010 11:43:22 +0000 (13:43 +0200)]
C++ Editor: only show quickfix to insert a public declaration.
Reviewed-by: Roberto Raggi
Christian Kamm [Thu, 7 Oct 2010 12:12:45 +0000 (14:12 +0200)]
QmlJS: Always register C++ based components with their C++ name.
This is the name that other components will refer to it by. For
instance, MouseArea has a 'drag' property with type 'QDeclarativeDrag',
since QDeclarativeDrag was only exported as Qt.Drag and QtQuick.Drag,
the type lookup didn't manage to resolve the name.
(cherry picked from commit
b53ba61248ac398c98cf5849d050f99de92ff6a9)
Christian Kamm [Wed, 6 Oct 2010 11:50:04 +0000 (13:50 +0200)]
C++ indenter: Don't get confused on 'for (a in b)'.
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
(cherry picked from commit
c2d890f65e3d1975022aec4a70a93c53e43f38bc)
Denis Mingulov [Fri, 8 Oct 2010 10:57:45 +0000 (12:57 +0200)]
Qml Designer: Fix compilation without WebKit
Merge-request: 2181
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Thu, 7 Oct 2010 13:05:56 +0000 (15:05 +0200)]
version bump: 2.0.91 -> 2.0.92
Christian Kamm [Thu, 7 Oct 2010 12:47:25 +0000 (14:47 +0200)]
Fix crash related to 'add definition from declaration' quickfix.
Reviewed-by: hjk
Reviewed-by: Erik Verbruggen
Tobias Hunger [Thu, 7 Oct 2010 10:07:02 +0000 (12:07 +0200)]
Fix QML custom plugin wizard
Fix QML custom plugin wizard to work on windows and for pathes
comtaining spaces.
Reviewed-by: Erik Verbruggen
Olivier Goffart [Thu, 7 Oct 2010 09:25:53 +0000 (11:25 +0200)]
Fix typo in a comment
Friedemann Kleint [Thu, 7 Oct 2010 09:02:00 +0000 (11:02 +0200)]
Debugging Helpers: Include MinGW.
Reviewed-by: hjk
Acked-by: hjk
Christiaan Janssen [Wed, 6 Oct 2010 15:18:31 +0000 (17:18 +0200)]
QmlCppDebugger: failing gracefully when cdb engine cannot be initialized
Reviewed by: Friedemann Kleint
Thomas Hartmann [Wed, 6 Oct 2010 13:00:30 +0000 (15:00 +0200)]
QtQuickToolbar: disabling tooltip hoovering
This feature is not polished enough for the beta
Reviewed-by: dt
hjk [Wed, 6 Oct 2010 11:57:29 +0000 (13:57 +0200)]
debugger: fix breakpoint marker drawing after session ends
This is a stop-gap measure to make breakpoints usable again.
Proper fix is still needed.
Reviewed-by: Friedemann Kleint
Kai Koehne [Wed, 6 Oct 2010 12:09:07 +0000 (14:09 +0200)]
QmlObserver: Fix compilation if no private headers are installed
Don't support the Recording + Test Script features if there are
no private headers installed.
Reviewed-by: Lasse Holmstedt
Christian Kandeler [Wed, 6 Oct 2010 12:55:38 +0000 (14:55 +0200)]
Maemo: Make failed UTFS client upload non-fatal.
The reason is almost always that another instance is still running,
which means the program is already there anyway.
Reviewed-by: kh1
Reviewed-by: dt
Friedemann Kleint [Wed, 6 Oct 2010 12:56:18 +0000 (14:56 +0200)]
Building debugging helpers: Increase timeout to 80000ms.
Reviewed-by: hjk
Leandro Melo [Wed, 6 Oct 2010 11:06:54 +0000 (13:06 +0200)]
Fix color tooltip crash on mac.
Reviewed-by: hjk
Reviewed-by: dt
Task-number: QTCREATORBUG-2038
Friedemann Kleint [Wed, 6 Oct 2010 11:39:21 +0000 (13:39 +0200)]
Debugger[CDB]: Fix breakpoints.
Reviewed-by: hjk
Reviewed-by: aep <arvid.picciani@nokia.com>
Task-number: QTCREATORBUG-2612
Thomas Hartmann [Wed, 6 Oct 2010 11:35:28 +0000 (13:35 +0200)]
Using import Qt 4.7 (again)
We have to support the N900
Reviewed-by: dt
Tobias Hunger [Wed, 6 Oct 2010 09:53:59 +0000 (11:53 +0200)]
Symbian: Add unit tests for RVCT parser
* Add unit tests for RVCT parser
* Make the unit tests pass.
Christian Kandeler [Wed, 6 Oct 2010 08:53:33 +0000 (10:53 +0200)]
Maemo: Fix SSH signal connections.
hjk [Tue, 5 Oct 2010 14:25:06 +0000 (16:25 +0200)]
debugger: more breakpoint fixes
Tobias Hunger [Wed, 29 Sep 2010 10:14:37 +0000 (12:14 +0200)]
Symbian: Make sure the EPOCROOT ends with / on Linux
Task-number: QTCREATORBUG-2445
Reviewed-by: Pawel Polanski
Thomas Hartmann [Wed, 6 Oct 2010 08:34:14 +0000 (10:34 +0200)]
QmlDesigner: removing strange file
Reviewed-by: Trust Me
Friedemann Kleint [Wed, 6 Oct 2010 08:32:36 +0000 (10:32 +0200)]
Debugger[Breakpoints]: Do not trigger reinserting breakpoint unless changed.
Add a menu option to edit breakpoints to the locator/editor context menu.
Reviewed-by: hjk
Kai Koehne [Wed, 6 Oct 2010 08:17:31 +0000 (10:17 +0200)]
QmlDesigner: Fix compile warning
Christian Kamm [Wed, 6 Oct 2010 08:15:30 +0000 (10:15 +0200)]
QmlDump: If a automatic build fails, don't try again directly.
Reviewed-by: Kai Koehne
Kai Koehne [Wed, 6 Oct 2010 08:03:51 +0000 (10:03 +0200)]
QmlDump: Get right Qt version for .qmlproject
We're using a QObject property to get the Qt Version Id: QmlDumpTool
is in Qt4ProjectManager, which shouldn't have a dependency to QmlProjectManager.
Reviewed-by: Christian Kamm
Christian Kandeler [Wed, 6 Oct 2010 08:08:39 +0000 (10:08 +0200)]
SSH: Declare signal parameter with full namespace.
Otherwise we can't sensibly declare slots with a matching parameter.
Christian Kamm [Wed, 6 Oct 2010 07:54:40 +0000 (09:54 +0200)]
Add to the changes file.
Thomas Hartmann [Wed, 6 Oct 2010 07:46:48 +0000 (09:46 +0200)]
QmlDesigner: using Qt 4.7 again
We need to support the N900
Reviewed-by: Kai Koehne
Thomas Hartmann [Tue, 5 Oct 2010 08:34:11 +0000 (10:34 +0200)]
QmlDesigner.propertyEditor: fix WebView page
This patch add a proper WebView page
to the property editor.
Reviewed-by: Trust Me
Tobias Hunger [Tue, 5 Oct 2010 15:57:50 +0000 (17:57 +0200)]
VCS: Abort commit on ESC
Abort a commit when pressing ESC in the "Do you want to commit?" dialog.
Task-number: QTCREATORBUG-2616
Christian Kandeler [Tue, 5 Oct 2010 15:53:00 +0000 (17:53 +0200)]
Botan: Always compile with optimizations.
We rarely need to debug this, and the speed-up is impressive.
dt [Tue, 5 Oct 2010 15:34:28 +0000 (17:34 +0200)]
Qt4ProjectManager: Fix subnode build
Reviewed-By: hunger
Tobias Hunger [Tue, 5 Oct 2010 14:31:26 +0000 (16:31 +0200)]
Git: Improve handling of author information
Task-number: QTCREATORBUG-2610
Reviewed-by: Robert Loehning
Christian Kandeler [Tue, 5 Oct 2010 15:39:17 +0000 (17:39 +0200)]
Maemo: Update "changes" file.
Daniel Molkentin [Tue, 5 Oct 2010 15:35:21 +0000 (17:35 +0200)]
Fit all tips even on 120 DPI screens.
Task-Number: QTCREATORBUG-2587
Daniel Molkentin [Tue, 5 Oct 2010 15:34:11 +0000 (17:34 +0200)]
Make more room on the welcome page.
Daniel Molkentin [Tue, 5 Oct 2010 15:27:36 +0000 (17:27 +0200)]
Fix Tips of the Day with dark color schemes.
Task-Number: QTCREATORBUG-1769
con [Tue, 5 Oct 2010 15:13:58 +0000 (17:13 +0200)]
Cpp locator filters were not opening edit mode (if you were elsewhere),
and the "current document" filter didn't jump to the column
Reviewed-by: Erik Verbruggen
Kai Koehne [Tue, 5 Oct 2010 14:21:24 +0000 (16:21 +0200)]
QmlJSDebugger: Fix linkage error
Make sure that the private API used from Qt is compiled with
Q_DECL_IMPORT.
Task-number: QTCREATORBUG-2609
Kai Koehne [Tue, 5 Oct 2010 11:12:58 +0000 (13:12 +0200)]
QmlJSDebugger: Fix path in standalone .pro file
Friedemann Kleint [Tue, 5 Oct 2010 14:39:07 +0000 (16:39 +0200)]
Debugger[CDB]: Make breakpoints work again.
Reviewed-by: hjk
Christian Kandeler [Tue, 5 Oct 2010 14:09:45 +0000 (16:09 +0200)]
SSH: Finish Implementing SFTP test.
Christian Kandeler [Tue, 5 Oct 2010 12:53:19 +0000 (14:53 +0200)]
SSH: Implement first half of SFTP test.
hjk [Tue, 5 Oct 2010 14:05:47 +0000 (16:05 +0200)]
debugger: fix breakpoint cleanup to allow subsequent runs
Reviewed-by: Friedemann Kleint
hjk [Tue, 5 Oct 2010 12:19:49 +0000 (14:19 +0200)]
changes-2.1.0: some fixes had been backported to 2.0.1, don't mention them twice
Tobias Hunger [Tue, 5 Oct 2010 12:57:36 +0000 (14:57 +0200)]
Filemanager: Ignore editory with temporary files
When switching to a editor containing a temporary file do not
update the filemanager, even when sync to editor is enabled.
Task-number: QTCREATORBUG-2605
Reviewed-by: Thorbjorn Lindeijer
kh1 [Tue, 5 Oct 2010 12:18:18 +0000 (14:18 +0200)]
Replace QToolBars with StyledBar. Remove minimum size constraints.
Reviewed-by: con
Friedemann Kleint [Tue, 5 Oct 2010 12:30:26 +0000 (14:30 +0200)]
Debugger[CDB]: Handle 'enabled' configuration setting.
Pass on error message when engine creation fails.
Reviewed-by: hjk
Task-number: QTCREATORBUG-2608
Friedemann Kleint [Tue, 5 Oct 2010 12:25:04 +0000 (14:25 +0200)]
Debugger[CDB]: Adapt SharedLib-Dumpers to new std::vector.
Reviewed-by: hjk
Roberto Raggi [Mon, 4 Oct 2010 12:42:37 +0000 (14:42 +0200)]
Resolve local using namespace directives.
Reviewed-by: Erik Verbruggen
con [Tue, 5 Oct 2010 11:44:46 +0000 (13:44 +0200)]
Fix scrolling of compile output windwow yet again
Broke with
29b073e92e61972846b743e52787b56a0a4d58d0
Reviewed-by: mae
hjk [Tue, 5 Oct 2010 11:54:21 +0000 (13:54 +0200)]
changes-2.1.0: add a few debugger and fakevim related items
hjk [Tue, 5 Oct 2010 11:12:56 +0000 (13:12 +0200)]
debugger: don't make actions more dynamic then they need to be
done with con
Marco Bubke [Tue, 5 Oct 2010 11:21:41 +0000 (13:21 +0200)]
QmlDesigner.NodeInstances: Search for every child object and tweak it
Refactoring old code and now sets a flag for every QGraphicsWebView to
use not the backing store code of webkit. The backing store is not
working for Bauhaus.
Reviewed-By: Thomas Hartmann
Marco Bubke [Tue, 5 Oct 2010 11:19:23 +0000 (13:19 +0200)]
QmlDesigner.NodeInstances: Cleanup paint methode
Reviewed-By: Thomas Hartmann
Marco Bubke [Tue, 5 Oct 2010 11:16:55 +0000 (13:16 +0200)]
QmlDesigner.NodeInstances: Use setParentItem for children property
Sets a internal flag in the QGraphicsItem to use setParentItem and not
setParentItemHelper for the children property list in QGraphicsObect.
Reviewed-By: Thomas Hartmann
dt [Tue, 5 Oct 2010 11:14:47 +0000 (13:14 +0200)]
Qt4BuildConf.: Prevent creating BuildConfigurations with invalid Qts
Task-Nr: QTCREATORBUG-2598
hjk [Tue, 5 Oct 2010 10:47:23 +0000 (12:47 +0200)]
debugger: introduce an "undisturbable" context
It is active when the debugger runs but should not be touched, like
the periods between InferiorRunRequested and InferiorRunOk etc.
Without that context the core debug start action would trigger,
and create another debugger instance.
Reviewed-by: Friedemann Kleint
hjk [Mon, 4 Oct 2010 12:15:41 +0000 (14:15 +0200)]
merge forgotten changes-2.0.1 file
hjk [Mon, 4 Oct 2010 06:43:05 +0000 (08:43 +0200)]
fakevim: compile fix for manual test
Reviewed-by: Friedemann Kleint
Kai Koehne [Tue, 5 Oct 2010 08:54:05 +0000 (10:54 +0200)]
QmlProject: Disable debug action if qmlobserver cannot be built
QmlObserver right now requires 4.7.1 minimum. There's no gain in
telling the user that he needs qmlobserver to debug, if it can't be
build with 4.7.0 anyway.
Reviewed-by: Christiaan Janssen
Kai Koehne [Tue, 5 Oct 2010 08:20:18 +0000 (10:20 +0200)]
qmldump: Allow qmldump to be also built in release mode
Don't force that qmldump is compiled in debug mode: This won't work
with a Qt compiled only in release mode.
If Qt is built with debug_and_release, qmldump will be build in release
mode.
Reviewed-by: ckamm
Kai Koehne [Tue, 5 Oct 2010 07:32:45 +0000 (09:32 +0200)]
qmldump: Always check for private headers being available
4.7.1 won't come with private headers always being installed.
Reviewed-by: ckamm
Tobias Hunger [Fri, 1 Oct 2010 14:33:23 +0000 (16:33 +0200)]
Git: ignore spaces in diff
Ignore spacing changes in diff (based on same setting as used to
ignore spacing in git blame).
Task-number: QTCREATORBUG-2526
con [Tue, 5 Oct 2010 10:16:58 +0000 (12:16 +0200)]
Update changes file
Tobias Hunger [Tue, 5 Oct 2010 10:01:14 +0000 (12:01 +0200)]
Symbian: Fix header pathes to work for c++ engine
Task-number: QTCREATORBUG-2604
Reviewed-by: Alessandro Portale
Reviewed-by: Pawel Polanski
Tobias Hunger [Mon, 4 Oct 2010 15:50:55 +0000 (17:50 +0200)]
Do not allow all WS names in Run-/Deploy-/BuildCOnfigs
Task-number: QTCREATORBUG-2584
Christian Kamm [Tue, 5 Oct 2010 09:32:43 +0000 (11:32 +0200)]
Update changes file for 2.1.
Tobias Hunger [Tue, 5 Oct 2010 08:22:58 +0000 (10:22 +0200)]
Git: Unbreak cloneing of non-default branches from local repos.
Do not fail when cloning non-defautl branches from local repositories:
Branches do already exist in this case, so do not try to set them up
again.
Tobias Hunger [Tue, 5 Oct 2010 08:11:36 +0000 (10:11 +0200)]
Git: Handle unusual HEADs
Handle detached HEADs as well as cloning from repositories that default
to another branch but master. This is relevant when clonig local
repositories.
Reviewed-by: Friedemann Kleint
Christian Kamm [Tue, 5 Oct 2010 09:22:30 +0000 (11:22 +0200)]
Debugging helpers: Add forgotten file to qmldump build.
Should stop qmldump processes from showing up in the MacOS dock.
Reviewed-by: Lasse Holmstedt
Christiaan Janssen [Tue, 5 Oct 2010 09:01:14 +0000 (11:01 +0200)]
QmlObserver: breakpoint list is shared between engines
Reviewed by: Kai Koehne, Andre Poenitz
Leena Miettinen [Tue, 5 Oct 2010 08:25:15 +0000 (10:25 +0200)]
Doc - using advanced find to search for C++ symbols
Fix UI text capitalization, edit text, and add screen shots.
Reviewed-by: con
Friedemann Kleint [Tue, 5 Oct 2010 08:16:27 +0000 (10:16 +0200)]
L10n: Fix placeholders.
Friedemann Kleint [Tue, 5 Oct 2010 07:54:07 +0000 (09:54 +0200)]
L10n: Update German translation for 2.1 beta.
Friedemann Kleint [Tue, 5 Oct 2010 07:53:34 +0000 (09:53 +0200)]
L10n: tr()-Fixes.
Friedemann Kleint [Tue, 5 Oct 2010 07:44:33 +0000 (09:44 +0200)]
L10n: tr()-Fixes