OSDN Git Service
Leandro Melo [Fri, 3 Dec 2010 12:43:13 +0000 (13:43 +0100)]
C++ editor: Don't sort global completions for performance reasons
Reviewed-by: Roberto Raggi
Christian Kandeler [Fri, 3 Dec 2010 15:57:25 +0000 (16:57 +0100)]
Maemo: Manually add "execute" bit to debian/rules file.
The file is expected to be executable on Linux. However, when it
was created on Windows and checked into a repository, the
bit will not be set when pulling it onto a Linux system, resulting
in packaging failure.
Task-number: QTCREATORBUG-3277
Reviewed-by: kh1
Reviewed-by: dt
Christian Kamm [Wed, 1 Dec 2010 13:33:18 +0000 (14:33 +0100)]
Add dump of QtMobility plugins to default type descriptions.
This will enable comlpetion and validation for projects using the Qt
Mobility plugins even when the qmldump machinery fails.
con [Thu, 2 Dec 2010 09:38:04 +0000 (10:38 +0100)]
Version bump.
Daniel Molkentin [Tue, 30 Nov 2010 12:26:14 +0000 (13:26 +0100)]
Show buttons only when more than one tip is available
Task-number: QTCREATORBUG-3160
Reviewed-by: con
Thomas Hartmann [Fri, 26 Nov 2010 11:02:11 +0000 (12:02 +0100)]
QmlDesigner.rewriter: fix possible incompatibilities with import plugins
The current Qt Version might be build with mingw or even be a Symbian
or Maemo target. This patch ensures that we do not try to load a plugin
from the configured Qt Version anymore.
Instead we only load plugins provided by Qt Creator
or plugins which are specified by: QML_IMPORT_PATH
Reviewed-by: Kai Koehne
Reviewed-by: Erik Verbruggen
Christian Kamm [Fri, 26 Nov 2010 09:32:27 +0000 (10:32 +0100)]
QmlDump: Allow building and using with Simulator Qt >= 4.7.1.
Reviewed-by: owolff
Reviewed-by: Kai Koehne
con [Thu, 25 Nov 2010 14:54:21 +0000 (15:54 +0100)]
Fix debugging Symbian gcce raptor built apps.
Local executable is put into a different folder
(always 'armv5' despite it being a 'gcce' build, changed in qmake),
and the symbol file is named 'foo.exe.sym' instead of 'foo.sym'.
Done-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
con [Thu, 25 Nov 2010 12:11:08 +0000 (13:11 +0100)]
Make src packaging script more flexible.
Sergey Belyashov [Thu, 25 Nov 2010 10:33:39 +0000 (11:33 +0100)]
Fixed few messages in Russian translation
Merge-request: 222
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Kai Koehne [Thu, 25 Nov 2010 08:43:23 +0000 (09:43 +0100)]
JsDebugger: Open original file if breakpoint is hit
Hotfix for Qt Quick Applications: Try to open the original file
by stripping "X.app/Contents/Resources" from the path.
Reviewed-by: Christiaan Janssen
Leena Miettinen [Wed, 24 Nov 2010 15:28:07 +0000 (16:28 +0100)]
Doc: installation packages are created when project is run (not built)
Reviewed-by: Alessandro Portale
Christiaan Janssen [Wed, 24 Nov 2010 15:28:05 +0000 (16:28 +0100)]
QmlDebugger: fixing Qml breakpoints not working on OSX
Reviewed-by: Kai Koehne
Leena Miettinen [Wed, 24 Nov 2010 12:20:10 +0000 (13:20 +0100)]
Doc: revert startup scripts
Reviewed-by: Robert Loehning
Leena Miettinen [Wed, 24 Nov 2010 12:19:10 +0000 (13:19 +0100)]
Doc: change the SDK name to Nokia Qt SDK
Reviewed-by: Robert Loehning
Christian Kandeler [Tue, 23 Nov 2010 15:23:13 +0000 (16:23 +0100)]
SSH: Switch DSA key generation mode
The mode we currently use is super paranoid about prime checking,
resulting in an unacceptably long key creation time of several minutes.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=200657
Reviewed-by: kh1
Reviewed-by: dt
Leena Miettinen [Tue, 23 Nov 2010 14:42:25 +0000 (15:42 +0100)]
Doc: update tutorial
Task-number: QTCREATORBUG-3092
Reviewed-by: Thomas Hartmann
Reviewed-by: Carsten Owerfeldt
Leena Miettinen [Tue, 23 Nov 2010 13:00:44 +0000 (14:00 +0100)]
Doc: remove build instructions
Task-number: QTCREATORBUG-3139
Reviewed-by: con
Leena Miettinen [Tue, 23 Nov 2010 12:24:12 +0000 (13:24 +0100)]
Doc: fix path
Task-number: QTCREATORBUG-2925
Reviewed-by: Daniel Molkentin
Leena Miettinen [Tue, 23 Nov 2010 09:24:35 +0000 (10:24 +0100)]
Doc: building projects in debug mode for debugging
Reviewed-by: Kai Koehne
Thomas Hartmann [Tue, 23 Nov 2010 11:14:48 +0000 (12:14 +0100)]
QmlDesigner.rewriter: crash fix for Flipable
Removing a property from a Flipabke back or front property
resulted in a crash, because the offset of UiObjectBinding
was not handled correctly.
The left hand side of the binding is not part of the node anymore.
Reviewed-by: Kai Koehne
Daniel Molkentin [Thu, 18 Nov 2010 19:29:40 +0000 (20:29 +0100)]
Add some more examples if available (SDK case)
Reviewed-by: Alessandro Portale
Tobias Hunger [Mon, 22 Nov 2010 14:38:21 +0000 (15:38 +0100)]
Symbian: Unset SBS_HOME when not needed
Unset SBS_HOME when none is needed. This prevents SBS from getting
confused about where its dependencies are located.
Task-number: QTCREATORBUG-3145
Reviewed-by: Alessandro Portale
Kai Koehne [Mon, 22 Nov 2010 13:57:14 +0000 (14:57 +0100)]
QmlProject: Fix creator becoming unresponsive if filesystem changes
Buffer update calls to the project tree. Otherwise large updates (e.g.
renaming a directory) will block QtCreator for up to several minutes.
Reviewed-by: ckamm
Friedemann Kleint [Mon, 22 Nov 2010 14:08:15 +0000 (15:08 +0100)]
Code model: Fix endless loop in AbstractEditorSupport::functionAt
used by CDB debugger tooltip (introduced by
A
354b9712e4655040930a9f18de4e6b4c71dc42d9).
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Rubber-stamped-by: dt
dt [Mon, 22 Nov 2010 12:43:21 +0000 (13:43 +0100)]
Qt4ProjectManager: Do not enumerate files from cumulatively found folders
Ignore folders from cumulative parse, we are recursively enumerating all the
files from those folders and add watchers for them, that's too dangerous
if we get the foldrs wrong and enumerate the whole project tree multiple
times.
Task-Nr: QTCREATORBUG-3104
Reviewed-By: con
Reviewed-By: Alessandro Portale
Kai Koehne [Fri, 19 Nov 2010 15:03:12 +0000 (16:03 +0100)]
Bauhaus: Remove invalid image file
Requested-by: Maurice Kalinowski
Alessandro Portale [Mon, 22 Nov 2010 10:06:45 +0000 (11:06 +0100)]
Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.
The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.
This patch removes the -leiksrv and bumps the version for
the template.
Cherrypicking into qtcreator/2.1 is highly recommended.
Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
Leena Miettinen [Fri, 19 Nov 2010 15:23:36 +0000 (16:23 +0100)]
Doc: modify text because Qt SDK contents have changed
Reviewed-by: Oswald Buddenhagen
Leena Miettinen [Fri, 19 Nov 2010 15:23:09 +0000 (16:23 +0100)]
Doc: fix a link to Qt 4.7
Reviewed-by: Oswald Buddenhagen
Leena Miettinen [Fri, 19 Nov 2010 15:22:14 +0000 (16:22 +0100)]
Doc: replace Qt SDK product name with a macro
Reviewed-by: Oswald Buddenhagen
Oswald Buddenhagen [Thu, 18 Nov 2010 18:33:40 +0000 (19:33 +0100)]
fix ts targets under windows
Leandro Melo [Thu, 18 Nov 2010 17:49:21 +0000 (18:49 +0100)]
Generic highlighter: Add some Kate LGPL files
Reviewed-by: con
Daniel Molkentin [Tue, 16 Nov 2010 18:10:13 +0000 (19:10 +0100)]
Move Qt QML projects to pro-based projects
Reviewed-by: dt
Daniel Molkentin [Thu, 18 Nov 2010 14:01:18 +0000 (15:01 +0100)]
Make preferred version work in all cases
Reviewed-by: dt
Sergey Belyashov [Wed, 17 Nov 2010 15:53:06 +0000 (16:53 +0100)]
Updated Russian translation
Merge-request: 220
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 17 Nov 2010 15:22:00 +0000 (16:22 +0100)]
CodePaster: Fix listing of pastebin.com.
Skip multiple left-boxes (mobile section).
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Rubber-stamped-by: dt
Task-number: QTCREATORBUG-3118
Thomas Hartmann [Wed, 17 Nov 2010 11:59:08 +0000 (12:59 +0100)]
QmlDesigner: adding a distinguished context for the form editor
Since Actions like copy/paste and delete interfiere
with controls like LineEdit, I added a special context
for the form editor. Now copy/paste/delete on the Qml items
are only registered for the form editor context and copying the contens
of a LineEdit will not lead to copy an item instead, anymore.
Reviewed-by: Kai Koehne
Tobias Hunger [Wed, 17 Nov 2010 09:37:11 +0000 (10:37 +0100)]
Symbian: Fix pathes
Fix pathes for Nokia Qt SDK:
* Set SBS path in one location only
* Fix up perl path
* Set path to CMD on windows. Both ABLD and SBSv2 actually need this.
* Set GCC path only if the directory actually exists
These fixes allow for building both ABLD and SBSv2 based projects in
a clean environment.
Reviewed-by: Tim Jenssen
Leandro Melo [Wed, 17 Nov 2010 10:00:51 +0000 (11:00 +0100)]
Tooltips: Fix brief description for QML elements
The brief description was not being shown. The help id for a
QML element is something like QML.Item while the extraction
mark is simply Item.
Reviewed-by: Thomas Hartmann
Reviewed-by: con
Kai Koehne [Thu, 11 Nov 2010 15:50:45 +0000 (16:50 +0100)]
QmlObserver: Fix navigation on Mac OS X
The QmlObserver relies on installing an event handler on the graphicsview
viewport, to get e.g. Mouse events.
QmlObserver on Mac OS X switches the viewport later on to a QGLViewPort, when
QmlObserver has already been set up ... Make QmlObserver aware of this by
listening to the ChildRemoved event that will be signalled in this case.
Task-number: QTCREATORBUG-2892
Reviewed-by: Lasse Holmstedt
Christian Kamm [Mon, 15 Nov 2010 14:32:46 +0000 (15:32 +0100)]
Fix crash when computing the selection path.
Task-number: QTCREATORBUG-3097
Reviewed-by: con
Oswald Buddenhagen [Mon, 15 Nov 2010 18:00:07 +0000 (19:00 +0100)]
compile, thank you very much
con [Mon, 15 Nov 2010 16:53:32 +0000 (17:53 +0100)]
Fixes: Mac: Size of build steps increases when hovered
The fixed size buttons were too big on Mac.
Task-number: QTCREATORBUG-3098
Reviewed-by: Jens Bache-Wiig
Tobias Hunger [Mon, 15 Nov 2010 15:46:42 +0000 (16:46 +0100)]
Symbian: Allow installer to set SBS v2 directory
Allow the installer to specify the SBS v2 directory.
Reviewed-by: Tim Jenssen
Tobias Hunger [Mon, 15 Nov 2010 14:24:17 +0000 (15:24 +0100)]
Symbian: Provide field in Qt version to set up SBSv2
Provide a field in the symbian Qt version to set up the SBSv2 build
system.
Reviewed-by: dt
Christian Kandeler [Mon, 15 Nov 2010 10:44:21 +0000 (11:44 +0100)]
Help plugin: Fix possible crash on documentation update.
We must not call updateFilterPage() when the "Options" dialog
is not currently open.
Without this patch, Creator will crash on a documentation update
if that dialog has been opened at least once and is currently closed.
Reviewed-by: kh1
Reviewed-by: con
Kai Koehne [Thu, 11 Nov 2010 10:39:57 +0000 (11:39 +0100)]
QmlWizards: Unify templates
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).
Reviewed-by: Alessandro Portale
Christian Kamm [Fri, 12 Nov 2010 12:37:54 +0000 (13:37 +0100)]
QmlProject and Observer: Work with Simulator Qt targets.
This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.
Reviewed-by: Kai Koehne
Pawel Polanski [Mon, 8 Nov 2010 13:35:32 +0000 (14:35 +0100)]
Value for "silent installation" for SymbianOS is random - bug fixed
Task-number: QTCREATORBUG-3016
Leandro Melo [Thu, 11 Nov 2010 17:08:18 +0000 (18:08 +0100)]
Remove empty dir from static.pro
This was added in the case we start shipping some of the Kate XMLs (still
a pending decision), which should be placed in this dir. However, this
causes a warning when loading qtcreator.pro with master branch version.
So I'll removed it. If we really ship the files it should be re-added
and also the installer notified.
Reviewed-by: con
Leena Miettinen [Fri, 12 Nov 2010 08:22:47 +0000 (09:22 +0100)]
Doc: fix a typo
Leena Miettinen [Thu, 11 Nov 2010 16:34:12 +0000 (17:34 +0100)]
Doc: added a warning about opening ports
Task-number: QTCREATORBUG-3074
Reviewed-by: Olivier Goffart
Thomas Hartmann [Thu, 11 Nov 2010 15:32:46 +0000 (16:32 +0100)]
QuickToolBar: critical bugfix
The protype chain is cached in m_prototypes,
but the type might have changed.
We have to check for this case.
Reviewed-by: Lasse Holmstedt
Christian Kandeler [Thu, 11 Nov 2010 15:27:54 +0000 (16:27 +0100)]
Don't allow to re-run debugger run controls.
They don't support that currently, so we should not offer it.
Quick fix for 2.1 release. Debuggers should be fixed instead.
Reviewed-by: dt
Kai Koehne [Thu, 11 Nov 2010 09:50:06 +0000 (10:50 +0100)]
QmlObserver: Remove breadcrumb widget in observer mode
I wasn't able to get it working on Mac OS X: Putting it on top
of the QGraphicsView doesn't work because Cocoa doesn't allow a
widget to be on top of OpenGL viewport. Embedding it as a
QGraphicsProxyWidget produces lots of Cocoa warnings (raster engine related).
Anyhow, the same widget shows up in the Debugger/Observer tab of
Qt Creator.
Reviewed-by: Lasse Holmstedt
Kai Koehne [Thu, 11 Nov 2010 11:05:01 +0000 (12:05 +0100)]
QmlOutline: Only show first line of annotation
Fix the artifacts when the annotations contain a multi-line string.
Task-number: QTCREATORBUG-2889
Reviewed-by: erikv
Leandro Melo [Wed, 10 Nov 2010 14:09:18 +0000 (15:09 +0100)]
Plain text editor: Make sure user setting about folding markers is used
It was being reset based on the highlighter definitions.
Consider some refactoring with the related options as well to avoid
overriding user's settings.
Done-with: Thorbjorn Lindeijer
Thomas Hartmann [Wed, 10 Nov 2010 10:39:58 +0000 (11:39 +0100)]
QmlDesigner.itemLibrary: use pixelSize instead of pointSize as default.
Since all units in qml are usually pixels and mobile devices
usually have much higher dpi than desktop screens, specifing font sizes
in points is usually not what a user wants to do.
Reviewed-by: Kai Koehne
Thomas Hartmann [Wed, 10 Nov 2010 10:34:26 +0000 (11:34 +0100)]
QuickToolBar: refine gradient editing
This patch solves minor usablity issues
in the gradient editing.
Reviewed-by: Lasse Holmstedt
Christian Kandeler [Wed, 10 Nov 2010 10:15:19 +0000 (11:15 +0100)]
Maemo: Don't try to re-run run control when run configuration is gone.
Quick fix for 2.1.
Proper fix is to copy all relevant information at run control creation time.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=203698
Reviewed-by: dt
Thomas Hartmann [Tue, 9 Nov 2010 15:44:48 +0000 (16:44 +0100)]
QmlDesigner: fix memory leak
Reviewed-by: Kai Koehne
Leandro Melo [Tue, 9 Nov 2010 15:01:58 +0000 (16:01 +0100)]
Generic highlighter: Add Creator's share folder in the fallback definitions search.
This leaves the code prepared if we decide to ship some of the Kate XMLs (still
a pending decision). In this case the installer needs to be "notified" and the
Kate files put in the repo.
An addition check for actual XML files in the searched directories is also added.
Reviewed-by: con
Reviewed-by: Thorbjorn Lindeijer
Christian Kamm [Tue, 9 Nov 2010 14:07:04 +0000 (15:07 +0100)]
QmlDump: Don't try to build if it can't succeed.
Fixes trying to build qmldump for device Qt versions and removes the
follow-up warning about it not being possible.
Task-number: QTCREATORBUG-3046
Reviewed-by: Lasse Holmstedt
Reviewed-by: Kai Koehne
Jarek Kobus [Tue, 9 Nov 2010 11:51:46 +0000 (12:51 +0100)]
Update Polish translations
Kai Koehne [Tue, 9 Nov 2010 11:32:33 +0000 (12:32 +0100)]
QmlObserver: Fix compilation if no private headers are installed
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.
Reviewed-by: Christiaan Janssen
Christian Kandeler [Mon, 8 Nov 2010 17:14:09 +0000 (18:14 +0100)]
Maemo: Fix SFTP channel leak.
Reviewed-by: dt
Alessandro Portale [Mon, 8 Nov 2010 15:43:18 +0000 (16:43 +0100)]
Forgotten change in
2a7336b4d661466f31ee487b95ec44d54df88792
Call the new QmlApplicationViewer::showExpanded();
Task-Number: QTCREATORBUG-2979
Reviewed-By: dt
Kai Koehne [Fri, 5 Nov 2010 14:00:34 +0000 (15:00 +0100)]
Application Output: Fix linkification of files in shadow builds / deployment folders
Try to map absolute paths pointing to files in shadow build directory
/ on the device to the respective files in the project directory.
Task-number: QTCREATORBUG-2371
Reviewed-by: dt
Erik Verbruggen [Mon, 8 Nov 2010 14:14:39 +0000 (15:14 +0100)]
Fixed in-source builds for custom QML extension plug-ins.
Check if the output directory is different from the source dir. If so,
do the copying magic (shadow build), otherwise skip it (in-source build).
Task-number: QTCREATORBUG-3034
Reviewed-by: Alessandro Portale
Reviewed-by: Oswald Buddenhagen
Christian Kandeler [Mon, 8 Nov 2010 13:10:43 +0000 (14:10 +0100)]
Maemo: Don't interpret plugins as static libraries in deployment view.
Reviewed-by: Thorbjørn Lindeijer
Thomas Hartmann [Mon, 8 Nov 2010 13:03:17 +0000 (14:03 +0100)]
QmlDesigner.propertyEditor: crash fix
We have to check if an AuxiliaryData actually exists.
Reviewed-by: Kai Koehne
Roberto Raggi [Mon, 8 Nov 2010 10:29:44 +0000 (11:29 +0100)]
Fixed regression when completing function templates.
Reviewed-by: Erik Verbruggen
Kai Koehne [Fri, 5 Nov 2010 15:21:00 +0000 (16:21 +0100)]
Revert "QmlJsDebugger: Fix observer navigation on Mac OS X"
This reverts accidentally pushed commit
4f33fbc229e71f68e14ea0b42e2edd3ab349e7c4.
Kai Koehne [Fri, 5 Nov 2010 14:34:11 +0000 (15:34 +0100)]
QmlInspector: Fix mapping of file names to source dir on Mac
Qml Applications by default copy the qml files into XX.app/Contents/Resources in
the shadow build directory. Take this into account when trying to find the files in the source directory.
Reviewed-by: Alessandro Portale
Kai Koehne [Wed, 27 Oct 2010 06:01:22 +0000 (08:01 +0200)]
QmlJsDebugger: Fix observer navigation on Mac OS X
Seems that mouse events aren't sent through the viewport on Mac OS X.
Daniel Molkentin [Fri, 5 Nov 2010 12:40:46 +0000 (13:40 +0100)]
Fix welcome screen with 120 dpi and translations with overlength
Task-number: QTCREATORBUG-2984
Reviewed-by: dt
Thorbjørn Lindeijer [Thu, 4 Nov 2010 17:55:13 +0000 (18:55 +0100)]
Tweaked the deploystep files table a bit
Scroll per pixel is nicer and highlighting sections is not useful. Elide
mode is now set in the UI file. Also, set a minimum height so that it
doesn't go too small.
Reviewed-by: Christian Kandeler
Daniel Molkentin [Thu, 4 Nov 2010 18:05:20 +0000 (19:05 +0100)]
Replace URL for Forum Nokia Support Page
Reviewed-by: dt
con [Thu, 4 Nov 2010 14:41:41 +0000 (15:41 +0100)]
Clean the link dependencies between QML and Qt4 project manager.
The Qt4 project manager was unnecessarily linking against the QML JS
editor plugin.
Reviewed-by: dt
dt [Thu, 4 Nov 2010 13:02:45 +0000 (14:02 +0100)]
Qt4ProjectManager: updateFileList on a external folder change
Task-Nr: QTCREATORBUG-3001
hjk [Thu, 4 Nov 2010 12:49:15 +0000 (13:49 +0100)]
debugger: Fix memory cache cleanup for trk adapters.
Reviewed-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
Thomas Hartmann [Thu, 4 Nov 2010 10:11:18 +0000 (11:11 +0100)]
QmlDesigner.propertyEditor: fix anchoring
There was a bug in the sibling margin for
the bottom anchor.
Also, disabling width/height in the property editor
only makes sense, if both anchors (top/left or op/bottom)
are set.
Reviewed-by: Kai Koehne
Thomas Hartmann [Thu, 4 Nov 2010 10:08:39 +0000 (11:08 +0100)]
QmlDesigner: fixes id renaming if there was no id before
Refactoring only works of old and newId are not empty,
otherwise we just fall back and use the model
Task-number: QTCREATORBUG-2953
Reviewed-by: Kai Koehne
Thomas Hartmann [Thu, 4 Nov 2010 09:26:50 +0000 (10:26 +0100)]
QuickToolBars: fix cursor on Mac OS X
We have to set the cursor on Mac OS X
manually in enter and leave events.
Task-number: QTCREATORBUG-2622
Reviewed-by: Kai Koehne
Thomas Hartmann [Thu, 4 Nov 2010 09:23:25 +0000 (10:23 +0100)]
QuickToolBars: tweak and fix Text ui for Mac OS X
The ComboBox needs more space on Mac OS X,
so I increased the margins in the layouts.
Task-number: QTCREATORBUG-2624
Reviewed-by: Kai Koehne
hjk [Thu, 4 Nov 2010 09:50:13 +0000 (10:50 +0100)]
debugger: catch python exception
Iterating through gdb.Frame.blocks() also yields function-local struct
definitions that cause later errors when attempting to use them as
local variable. This is arguably a gdb issue as it is inconsistent with
the result of plain old "info locals" output.
Reviewed-by: Friedemann Kleint
Kai Koehne [Wed, 3 Nov 2010 12:47:42 +0000 (13:47 +0100)]
Qml Wizard: Turn error about qml debugging getting disabled into a warning
Qml Debugging requires 4.7.1, and the path of qmljsdebugger being
specified on the command line. Just disable debugging if this
isn't the case instead of bailing out an error.
Reviewed-by: dt
Kai Koehne [Wed, 3 Nov 2010 10:46:56 +0000 (11:46 +0100)]
QmlObserver: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (
b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...
Reviewed-by: Alessandro Portale
Kai Koehne [Wed, 3 Nov 2010 09:44:40 +0000 (10:44 +0100)]
QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (
b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...
The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.
Reviewed-by: Alessandro Portale
con [Tue, 2 Nov 2010 10:35:47 +0000 (11:35 +0100)]
Source package creation script needs to differentiate branch vs version.
Thomas Hartmann [Tue, 2 Nov 2010 10:17:59 +0000 (11:17 +0100)]
QmlDesigner: fixes crash
Deleting an items might have a side effect that turns
the qml code invalid. (e. g. alias properties)
We catch this an show a proper error message.
Task-number: QTCREATORBUG-2973
Reviewed-by: Kai Koehne
con [Tue, 2 Nov 2010 10:15:12 +0000 (11:15 +0100)]
Version bump.
con [Tue, 2 Nov 2010 10:10:09 +0000 (11:10 +0100)]
Merge remote branch 'origin/2.1.0' into 2.1
hjk [Tue, 2 Nov 2010 09:59:52 +0000 (10:59 +0100)]
debugger: work around gdb 7.2 quirk in QFlag dumper
Reviewed-By: Friedemann Kleint
hjk [Mon, 1 Nov 2010 18:10:44 +0000 (19:10 +0100)]
debugger: make QFile and QFileInfo visible without top-level inferior call
Reviewed-by: Oswald Buddenhagen
hjk [Mon, 1 Nov 2010 17:39:35 +0000 (18:39 +0100)]
debugger: fix dumping of reference targets
Reviewed-by: Alessandro Portale
Alessandro Portale [Mon, 1 Nov 2010 18:25:19 +0000 (19:25 +0100)]
Remove compile warning on Symbian.
Reviewed-By: TrustMe
Alessandro Portale [Mon, 1 Nov 2010 18:19:32 +0000 (19:19 +0100)]
Move hide implementation of conditional show()
...and do not call it show(), because that is the signature of
a non-virtual base class function. showExpanded() sucks as name,
and hjk, who reviewed this is not convinced.
But showExpanded() is still better than show().
Task-Number: QTCREATORBUG-2979
Reviewed-By: hjk
Alessandro Portale [Mon, 1 Nov 2010 16:03:46 +0000 (17:03 +0100)]
Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources
Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt