OSDN Git Service
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
Christian Kandeler [Mon, 4 Oct 2010 15:54:46 +0000 (17:54 +0200)]
Tests: Start implementing more thorough SSH test.
Friedemann Kleint [Mon, 4 Oct 2010 15:22:16 +0000 (17:22 +0200)]
L10n: tr()-fixes.
Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
Tobias Hunger [Fri, 1 Oct 2010 10:45:47 +0000 (12:45 +0200)]
Git: Change mapping of repository to directory name
Change the mapping of repository name to checkout directory name.
This should now work better with windows.
Tobias Hunger [Fri, 1 Oct 2010 09:29:11 +0000 (11:29 +0200)]
Polish the checkout wizard (base and git)
* Polish the base checkout wizard
* Make UI easier to grasp
* Add tooltips explaining things
Task-number: QTCREATORBUG-2540
Reviewed-by: Robert Loehning
Kai Koehne [Mon, 4 Oct 2010 15:03:30 +0000 (17:03 +0200)]
QmlProject: Remove "Import QML Directory" wizard
Reviewed-by: Christiaan Janssen
Kai Koehne [Mon, 4 Oct 2010 13:13:31 +0000 (15:13 +0200)]
QmlProject: Always use qmlobserver for debugging projects
Also only warn about missing qmlobserver when actually trying to
debug a .qmlproject.
Reviewed-by: Christiaan Janssen
Kai Koehne [Mon, 4 Oct 2010 13:03:01 +0000 (15:03 +0200)]
QmlProject: Let user select Qt version to use
Allow the user to choose which Qt version to use for running
a .qmlproject.
Reviewed-by: dt
Christian Kandeler [Mon, 4 Oct 2010 14:45:40 +0000 (16:45 +0200)]
Maemo: Fix deployment of inactive project.
Reviewed-by: kh1
Christian Kandeler [Mon, 4 Oct 2010 13:52:13 +0000 (15:52 +0200)]
Maemo: Introduce explicit states to SshRunner.
Reviewed-by: kh1
Thomas Hartmann [Mon, 4 Oct 2010 14:40:21 +0000 (16:40 +0200)]
Use QCoreApplication::translate instead of QCoreApplication::translate
As a general rule QCoreApplication::translate() should be used
instead of QCoreApplication::translate()
Reviewed-by: Friedemann Kleint
Thomas Hartmann [Mon, 4 Oct 2010 14:21:08 +0000 (16:21 +0200)]
QmlWizards: use QtQuick 1.0 instead of Qt 4.7
Reviewed-by: Kai Koehne
Friedemann Kleint [Mon, 4 Oct 2010 14:00:25 +0000 (16:00 +0200)]
Debugger: Remove unused 'precise breakpoints' setting.
Remove break window menu action to toggle 'Full path'.
Remove gdb setting 'Use full path'.
Clean up break dialog:
- Set PathChooser::ExpectedKind before value (showed up in red).
- Use PathChooser::setPath()/path() instead of lineedit text
- Return thread spec
- Add validator for ignorecount as for breakcondition.ui
Remove unused fields from breakcondition.ui
Reviewed-by: hjk
Task-number: QTCREATORBUG-2593
Tobias Hunger [Mon, 4 Oct 2010 14:01:49 +0000 (16:01 +0200)]
Fix build on non-windows
Thomas Hartmann [Mon, 4 Oct 2010 13:56:53 +0000 (15:56 +0200)]
QmlDesigner: compile fix
Reviewed-by: Friedemann Kleint
Tobias Hunger [Mon, 4 Oct 2010 13:37:15 +0000 (15:37 +0200)]
Git: Only allow commit if author information is valid
Check author information to be valid before enableing
the commit button.
Task-number: QTCREATORBUG-2410
Thomas Hartmann [Mon, 4 Oct 2010 13:38:29 +0000 (15:38 +0200)]
QmlDesigner.propertyEditor: cache QtQuick items instead of Qt
Fixes caching for Qt Quick items.
Also the emptyPane is found again.
Reviewed-by: Kai Koehne
Thomas Hartmann [Mon, 4 Oct 2010 13:33:29 +0000 (15:33 +0200)]
QmlDesigner.propertyEditor: adding missing qml file
This file got somehow missing during renaming
Reviewed-by: Trust Me
Thomas Hartmann [Mon, 4 Oct 2010 09:09:27 +0000 (11:09 +0200)]
QmlDesigner.rewriter: fix Qt 4.7 imports
This patch adds a MessageBox that asks for confirmation to fix
Qt 4.7 imports into QtQuick 1.0 imports.
Reviewed-by: Kai Koehne
Leena Miettinen [Mon, 4 Oct 2010 13:24:09 +0000 (15:24 +0200)]
Doc - availability of environment variables in custom build steps
Reviewed-by: Tobias Hunger
Christian Kandeler [Mon, 4 Oct 2010 12:50:58 +0000 (14:50 +0200)]
Wizards: Move QML standalone app wizard to QML category.
Task-number: QTCREATORBUG-2510
Reviewed-by: Alessandro Portale
Christian Kamm [Mon, 4 Oct 2010 12:32:50 +0000 (14:32 +0200)]
QmlJS: Fix instances of using lookupContext() on invalid info.
Task-number: QTCREATORBUG-2594
Done-with: Thomas Hartmann
Kai Koehne [Mon, 4 Oct 2010 12:23:20 +0000 (14:23 +0200)]
QmlDebugger: Make JS breakpoints not pending when they're hit
Task-number: QTCREATORBUG-2590
Reviewed-by: Christiaan Janssen
Christian Kandeler [Mon, 4 Oct 2010 10:54:14 +0000 (12:54 +0200)]
Maemo: Fix desktop file contents, ignore missing desktop file.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=195541
Reviewed-by: kh1
Friedemann Kleint [Mon, 4 Oct 2010 11:30:25 +0000 (13:30 +0200)]
CodePaster[CodePaster]: Allow for fetching complete URLs.
Reviewed-by: Tobias Hunger <qt-info@nokia.com>
Task-number: QTCREATORBUG-2542
Kai Koehne [Mon, 4 Oct 2010 11:18:40 +0000 (13:18 +0200)]
QmlInspector: Fix regression in live preview
ClientProxy::isEnabled() now only returns true when the server plugins
are available too. Wait until then before using it to initialize
the livepreview objects.
Reviewed-by: Lasse Holmstedt
Friedemann Kleint [Mon, 4 Oct 2010 10:19:28 +0000 (12:19 +0200)]
Debugger: Fix manual test.
to work at least for debug-in-source builds.
Reviewed-by: hjk
Task-number: QTCREATORBUG-2546
Lasse Holmstedt [Mon, 4 Oct 2010 10:02:52 +0000 (12:02 +0200)]
Debugging helpers: Preserve whole build log
Otherwise, users might only see parts of the build that succeeded, but
not the failed ones (depending on build order).
Reviewed-by: ckamm
Christian Kamm [Mon, 4 Oct 2010 09:56:10 +0000 (11:56 +0200)]
Debugging helpers: Only build qmldump/qmlobserver for desktop targets.
Task-number: QTCREATORBUG-2575
Reviewed-by: Kai Koehne
Friedemann Kleint [Mon, 4 Oct 2010 09:47:31 +0000 (11:47 +0200)]
Debugger[CDB]: Adapt internal std::string dumper to MSVC2010.
New STL implementation.
Reviewed-by: hjk
Pawel Polanski [Mon, 4 Oct 2010 08:38:10 +0000 (10:38 +0200)]
Null pointer exception when calling context menu on an empty area of Target step in new application wizard - fixed
Reviewed-by: Tobias Hunger
Alessandro Portale [Mon, 4 Oct 2010 08:44:23 +0000 (10:44 +0200)]
Only update Qml App stub files
The update mechanism kicked in also for Qml Mobile apps, which
happen to have a deployment.pri file aswell. But that was wrong.
The update must only happen if all qml app stub files were
found. This patch fixes it.
Task-Number: QTCREATORBUG-2529
Reviewed-by: ck
Alessandro Portale [Sat, 2 Oct 2010 15:51:36 +0000 (17:51 +0200)]
Merged 'New Qt quick App' and 'Import Qml App' Wizards
The only difference between these wizards was that in the
Import Wizard, the user was able to chose a .qml file.
So, why not merge them. Also, this commit is a nice code
reduction.
The module deployment feature was killed by popular demand.
Apparently, nobody writes or deploys Qml modules, these days.
Let's see when they want to have it back ;)
Task-Number: QTCREATORBUG-2505
Reviewed-by: ck
Alessandro Portale [Mon, 4 Oct 2010 02:10:54 +0000 (04:10 +0200)]
Qt Quick app wizard: Merge two .pri files into one
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.
At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.
And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.
Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
Alessandro Portale [Sat, 2 Oct 2010 22:28:36 +0000 (00:28 +0200)]
New wizards: Handle Symbian icon like Maemo icon
De-clutter the app profile:
- Call the Symbian icon <project>.svg
- Define the Symbian icon in the deployment .pri file
Task-Number: QTCREATORBUG-2578
Reviewed-by: ck
Kai Koehne [Mon, 4 Oct 2010 07:44:18 +0000 (09:44 +0200)]
QmlProject: Stop program when exiting creator
Task-number: QTCREATORBUG-2501
Christian Kamm [Mon, 4 Oct 2010 07:27:25 +0000 (09:27 +0200)]
Debugging helpers: Only fail if there was a chance of success.
Task-number: QTCREATORBUG-2563
Reviewed-by: Kai Koehne
Christian Kandeler [Sun, 3 Oct 2010 08:38:21 +0000 (10:38 +0200)]
Maemo: Close old SFTP channel when creating a new one.
Alessandro Portale [Sun, 3 Oct 2010 08:35:14 +0000 (10:35 +0200)]
Added comment
Alessandro Portale [Sun, 3 Oct 2010 07:28:03 +0000 (09:28 +0200)]
Do not scan "/" for include files
The scanning phase was in some cases insanely long.
Reason was that Creator feeds wrong paths to the
CppModelManager, for example "/".
The scanning phase did what it was told to: scan that whole
Harddrive.
This patch makes sure that the scanning is not done for "/"
Done-With: Roberto
Alessandro Portale [Sun, 3 Oct 2010 07:23:48 +0000 (09:23 +0200)]
No Samba while including files
(The other Samba is meant. The slow one, not the nice one.)
Creator manages to feed the CppModelManager with all kinds of
wrong include paths. That is usually not a big issue as long
as that path is not a simple "/".
CppManager appended a separator to all incoming include paths.
And when the above "/" was passed in, we had (on my machine)
7 seconds of Samba Network lookup, multiple times during a
parse. And the sad thing was that my dear colleagues in the
Intranet did not even have the searched-for header files on
their shared folders.
This patch makes sure that a separator is only appended if
the path does not already end with one.
The real core of the issue (wrong include paths from Creator)
still needs to be fixed.
Done-with: Roberto Raggi
Alessandro Portale [Sat, 2 Oct 2010 16:26:51 +0000 (18:26 +0200)]
Improved the comments in the generate qml app code.
This was committed to the master branch, but was supposed
to go into 2.1 (I misunderstood the branching strategy of
Creator 2.1).
Since this does not change Creator code:
Reviewed-by: Trustme
hjk [Fri, 1 Oct 2010 16:42:00 +0000 (18:42 +0200)]
fakevim: reset op count when leaving insert mode
Reviewed-by: Alessandro Portale
Task-number: QTCREATORBUG-2552
Pawel Polanski [Fri, 1 Oct 2010 16:37:30 +0000 (18:37 +0200)]
Unable to change the value of a variable while debugging Symbian - issue fixed
Reviewed-by: hjk
hjk [Fri, 1 Oct 2010 15:43:23 +0000 (17:43 +0200)]
debugger: fix QObject property dumping on Windows
The problem of gdb finding QVector::malloc instead of the global malloc
appeared again. The workaorund is to use calloc which is not used by Qt.
However, for transfering string literal data to the inferior gdb uses
malloc internally outside our control, so we cannot use string literals
in inferior calls at all.
In the particular case of QObject property names we are lucky as the
data already exists in the inferior memory. This patch just uses it.
Reviewed-by: Leandro Melo
Task: QTCREATORBUG-2533
Kai Koehne [Fri, 1 Oct 2010 15:42:13 +0000 (17:42 +0200)]
QmlJsInspector: Remove unconditional qDebug
Kai Koehne [Fri, 1 Oct 2010 15:30:50 +0000 (17:30 +0200)]
QmlInspector: Fix regression making the observer unusable
We've to wait with reloadEngines until the services are actually
enabled.
Kai Koehne [Fri, 1 Oct 2010 14:28:45 +0000 (16:28 +0200)]
QmlObserver: Disable UI when no server plugin exists
Reviewed-by: Christiaan Janssen
Kai Koehne [Fri, 1 Oct 2010 14:58:11 +0000 (16:58 +0200)]
QmlJSInspector: Remove disconnect without a connect
hjk [Fri, 1 Oct 2010 15:15:46 +0000 (17:15 +0200)]
debugger: fix disabling of breakpoints using the context menu
Reviewed-by: Robert Loehning
Task-number: QTCREATORBUG-2543, QTCREATORBUG-2544
Leena Miettinen [Fri, 1 Oct 2010 14:54:40 +0000 (16:54 +0200)]
UI text - fix capitalization in Qt Quick Application wizard
Reviewed-by: Christian Kandeler
Christian Kandeler [Fri, 1 Oct 2010 14:20:18 +0000 (16:20 +0200)]
Maemo: Kill UTFS clients as well as UTFS servers in case of an error.