OSDN Git Service
Marco Bubke [Tue, 5 Apr 2011 13:11:49 +0000 (15:11 +0200)]
QmlDesigner: Remove qDebug
Reviewed-by: Thomas Hartmann
hjk [Tue, 5 Apr 2011 15:11:00 +0000 (17:11 +0200)]
mimetypes: remove grid lines from table view
More consistent.
Reviewed-by: Leandro Melo
Thomas Hartmann [Tue, 5 Apr 2011 14:43:38 +0000 (16:43 +0200)]
QmlDesigner.model: bugfix for TabBar
A defaultProperty is always a list property.
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 5 Apr 2011 14:42:37 +0000 (16:42 +0200)]
QmlDesigner.model: crash fix
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 5 Apr 2011 14:41:49 +0000 (16:41 +0200)]
QmlDesigner.propertyEditor: crash fix
Reviewed-by: Marco Bubke
Bill King [Tue, 5 Apr 2011 13:03:13 +0000 (15:03 +0200)]
tests: get autotests compiling again.
Marco Bubke [Tue, 5 Apr 2011 11:42:00 +0000 (13:42 +0200)]
QmlDesigner: Canvas setting now reflected
Task-number: QTCREATORBUG-4317
Reviewed-by: Thomas Hartmann
Thomas Hartmann [Tue, 5 Apr 2011 11:42:33 +0000 (13:42 +0200)]
QmlDesigner.propertyEditor: fix for layout issues on Windows 7
Reviewed-by: Marco Bubke
Kai Koehne [Tue, 5 Apr 2011 08:33:16 +0000 (10:33 +0200)]
QmlPuppet: Fix compilation with no webkit
Reviewed-by: Thomas Hartmann
Christian Kandeler [Tue, 5 Apr 2011 07:07:33 +0000 (09:07 +0200)]
Maemo: Fix package metadata initialization bug.
We must check whether a target is fully initialized (meaning it
already has packaging metadata). Otherwise we will initialize one
target with bogus values from another, equally uninitialized one
when they are created at the same time (i.e. by a wizard).
Leena Miettinen [Tue, 5 Apr 2011 07:35:49 +0000 (09:35 +0200)]
Doc: polishing
Leena Miettinen [Tue, 5 Apr 2011 07:35:02 +0000 (09:35 +0200)]
Doc: correct order of selecting anchor buttons
Leena Miettinen [Tue, 5 Apr 2011 07:34:11 +0000 (09:34 +0200)]
Doc: restoring sessions
Leena Miettinen [Tue, 5 Apr 2011 07:32:41 +0000 (09:32 +0200)]
Doc: update screen shots
Pawel Polanski [Mon, 4 Apr 2011 15:03:36 +0000 (17:03 +0200)]
Symbian: crashes if canceled in a certain moment of package creation
Pawel Polanski [Mon, 4 Apr 2011 14:24:46 +0000 (16:24 +0200)]
CODA: CODA can crash while copying to device
Christian Kandeler [Mon, 4 Apr 2011 13:53:02 +0000 (15:53 +0200)]
Mobile wizard: The Mainwindow sources are not versioned.
Task-number: QTCREATORBUG-4363
Reviewed-by: Alessandro Portale
Friedemann Kleint [Mon, 4 Apr 2011 13:14:04 +0000 (15:14 +0200)]
Debugger[gdb]: Fix QUrl dumper.
"encodedOriginal" is a QByteArray.
Reviewed-by: hjk
Thorbjørn Lindeijer [Mon, 4 Apr 2011 12:33:39 +0000 (14:33 +0200)]
Resize behavior correction in Session Manager dialog
Stretch the list of sessions to prevent the buttons from stretching.
dt [Mon, 4 Apr 2011 11:47:58 +0000 (13:47 +0200)]
TargetSetupPage: Select desktop only as a fallback.
Reviewed-By: con
Pawel Polanski [Mon, 4 Apr 2011 11:34:47 +0000 (13:34 +0200)]
Some texts has been updated
Thomas Hartmann [Mon, 4 Apr 2011 11:25:27 +0000 (13:25 +0200)]
Merge branch '2.2' of git@scm.dev.nokia.troll.no:creator/mainline into 2.2
Thomas Hartmann [Mon, 4 Apr 2011 11:25:09 +0000 (13:25 +0200)]
QmlDesigner.rewriter: fix for compression
AddProperty also sets a value.
RemoveProperty and then AddProperty cannot be compressed like this.
Reviewed-by: Kai Koehne
Thomas Hartmann [Mon, 4 Apr 2011 11:23:38 +0000 (13:23 +0200)]
QmlDesigner.tests: compilefix
Leena Miettinen [Mon, 4 Apr 2011 10:27:25 +0000 (12:27 +0200)]
Doc: fix image name
Leena Miettinen [Mon, 4 Apr 2011 10:11:56 +0000 (12:11 +0200)]
Doc: add copyright statement
Friedemann Kleint [Mon, 4 Apr 2011 10:03:23 +0000 (12:03 +0200)]
L10n: German translations for 2.2
Friedemann Kleint [Mon, 4 Apr 2011 10:01:00 +0000 (12:01 +0200)]
Debugger: Fix spelling error in tooltip.
Last string change.
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Friedemann Kleint [Mon, 4 Apr 2011 09:58:00 +0000 (11:58 +0200)]
Debugger: Fix spelling error in tooltip.
Last string change.
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Mon, 4 Apr 2011 09:28:44 +0000 (11:28 +0200)]
Doc: added FAQ
Leena Miettinen [Thu, 31 Mar 2011 09:43:15 +0000 (11:43 +0200)]
UI text: fix capitalization
Reviewed-by: hjk
Leena Miettinen [Thu, 31 Mar 2011 09:18:41 +0000 (11:18 +0200)]
Doc: fix field name
Leena Miettinen [Thu, 31 Mar 2011 09:18:15 +0000 (11:18 +0200)]
Doc: add troubleshooting info
Reviewed-by: hjk
Leena Miettinen [Thu, 31 Mar 2011 07:24:26 +0000 (09:24 +0200)]
Doc: edit change file
Reviewed-by: hjk
Leena Miettinen [Wed, 30 Mar 2011 15:09:55 +0000 (17:09 +0200)]
Doc: fix capitalization of GDB and GCC
Pawel Polanski [Mon, 4 Apr 2011 09:05:24 +0000 (11:05 +0200)]
Symbian: Application's name is displayed on the "Application Output" tab while debugging
Task-number: QTCREATORBUG-4203
Reviewed-by: hjk
Kai Koehne [Mon, 4 Apr 2011 07:59:12 +0000 (09:59 +0200)]
QmlDump: Fix compilation on Linux, Windows
Fix regression introduced with
530e7494 : Creator now automatically
generates the Info.plist from a Info.plist.in file, but only on Mac
OS X. Therefore copying the Info.plist to the temporary folder failed
on all other platforms.
Reviewed-by: con
Thorbjørn Lindeijer [Fri, 1 Apr 2011 10:50:57 +0000 (12:50 +0200)]
Fixed value of DisassemblerCapability
Was the same as the ReloadModuleCapability.
Reviewed-by: Friedemann Kleint
Tobias Hunger [Fri, 1 Apr 2011 16:17:40 +0000 (18:17 +0200)]
Symbian: Make cloning of RVCT toolchain work
Make sure to not show PATH and other generated environment variables
in the base environment (which ends up in the configuration widget).
The generated changes will find their way into the set up changes
otherwise when accepting any change to the RVCT toolchain where they
will override other changes.
Task-number: QTCREATORBUG-4326
Reviewed-by: dt
Friedemann Kleint [Fri, 1 Apr 2011 15:44:24 +0000 (17:44 +0200)]
L10n: German translations for 2.2 (string freeze).
Tobias Hunger [Fri, 1 Apr 2011 15:13:03 +0000 (17:13 +0200)]
Qt: Make sure to import non-native pathes from ini
Make sure to not import non-native pathes from our settings
(from old versions of Qt Creator). We make sure to use only
proper slashes nowadays.
Task-number: QTCREATORBUG-4328
Reviewed-by: dt
Pawel Polanski [Fri, 1 Apr 2011 14:52:57 +0000 (16:52 +0200)]
Symbian: Fixed the 'Adapter start failed' bug
Task-number: QTCREATORBUG-4325
Reviewed-by: Friedemann Kleint
Thomas Hartmann [Fri, 1 Apr 2011 14:49:57 +0000 (16:49 +0200)]
QmlDesigner.statesEditor: do not add redundant imports
Do not add QtQuick 1.0 import if we already have a QtQuick 1.1
import.
Reviewed-by: Kai Koehne
Thomas Hartmann [Fri, 1 Apr 2011 14:47:18 +0000 (16:47 +0200)]
QmlDesigner.dragAndDrop: crash fix
Something could go wrong while adding the import.
e.g.: qmldump can fail
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4323
Christian Kandeler [Fri, 1 Apr 2011 14:19:10 +0000 (16:19 +0200)]
Maemo: Fix user-visible OS names.
Thomas Hartmann [Fri, 1 Apr 2011 12:01:26 +0000 (14:01 +0200)]
QmlDesigner.propertyEditor: fix fill button
The fill button should only be checked
if all 4 anchors are set and the margins are 0.
Reviewed-by: Kai Koehne
Thomas Hartmann [Fri, 1 Apr 2011 11:53:40 +0000 (13:53 +0200)]
QmlDesigner.propertyEditor: fixes anchoring in flickable
Searching through "children" is not enough since
some items have default properties like "flickableChildren".
So we mimic instanceChildren here by taking all subnodes and
comparing the instanceParent.
Reviewed-by: Kai Koehne
Thomas Hartmann [Fri, 1 Apr 2011 09:02:36 +0000 (11:02 +0200)]
QmlDesigner.propertyEditor: fix for scaling
Task-number: QTCREATORBUG-4335
Reviewed-by: Kai Koehne
Jarek Kobus [Fri, 1 Apr 2011 11:54:32 +0000 (13:54 +0200)]
Remove obsolete translations
Jarek Kobus [Fri, 1 Apr 2011 11:33:57 +0000 (13:33 +0200)]
Update Polish translations
Reviewed-by: Pawel Polanski
Christian Kandeler [Fri, 1 Apr 2011 08:37:57 +0000 (10:37 +0200)]
Maemo: Re-order some environment settings for extra safety.
Probably not needed here, but can't hurt either.
Christian Kandeler [Fri, 1 Apr 2011 07:58:29 +0000 (09:58 +0200)]
SSH: Fix tests to adapt to new location (utils vs. core plugin).
Christian Kandeler [Fri, 1 Apr 2011 06:54:56 +0000 (08:54 +0200)]
Maemo: Set DISPLAY for non-Maemo systems.
Christian Kandeler [Thu, 31 Mar 2011 16:30:27 +0000 (18:30 +0200)]
Meego: No verbose output for rpm.
Workaround for output window newline handling bug.
con [Thu, 31 Mar 2011 13:47:27 +0000 (15:47 +0200)]
General messages should stay at bottom when messages are posted
Fix is copying code from project explorer OutputWindow, which should be
shared instead.
Task-number: QTCREATORBUG-3839
Reviewed-by: Robert Loehning
Jarek Kobus [Thu, 31 Mar 2011 14:46:58 +0000 (16:46 +0200)]
Fix compilation
Friedemann Kleint [Thu, 31 Mar 2011 14:46:25 +0000 (16:46 +0200)]
Mimetype detection: Fix a bug in diff/patch-detection.
Give diff a higher priority than C++ (fixes 'apply patch').
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Jarek Kobus [Thu, 31 Mar 2011 14:30:37 +0000 (16:30 +0200)]
Fix typos in source strings
Reviewed-by: Pawel Polanski
Thomas Hartmann [Thu, 31 Mar 2011 13:43:53 +0000 (15:43 +0200)]
QmlDesigner.copyNPaste: fix for Components and default properties
To handle defaultProperties correctly in the text buffer for
copy n paste we have to forward the meta system.
Since the text buffer is not a qml document in Qt Creator
with all the infrastructure attached the meta system is
incomplete.
So we forward in these cases the meta system of the actual document.
Model::create() now gets an additional paramater where we can specify another
model for proxying the meta system.
Reviewed-by: Kai Koehne
Christian Kandeler [Thu, 31 Mar 2011 12:43:47 +0000 (14:43 +0200)]
Maemo: Fix HTML content.
Christian Kandeler [Thu, 31 Mar 2011 12:43:02 +0000 (14:43 +0200)]
Maemo: "Mad Developer" is now called "SDK Connectivity" on Harmattan.
hjk [Thu, 31 Mar 2011 13:11:27 +0000 (15:11 +0200)]
make plugin information accessible by mouse
Reviewed-by: con
Tobias Hunger [Thu, 31 Mar 2011 12:53:55 +0000 (14:53 +0200)]
toolchain: Make Id more unique
Take debugger into account when generating an Id. This fixes issues
with creator switching to the wrong tool chain when loading a project
Task-number: QTCREATORBUG-4295
Reviewed-by: dt
Tobias Hunger [Thu, 31 Mar 2011 08:13:35 +0000 (10:13 +0200)]
Toolchain: Allow SDK to provide default debuggers
Allow the SDK to provide default debuggers for any ABI.
Task-number: QTCREATORBUG-4292
Task-number: QTCREATORBUG-4299
Reviewed-by: Christian Kandeler
Tobias Hunger [Thu, 31 Mar 2011 07:54:18 +0000 (09:54 +0200)]
Maemo: Print debugger path in tool chain information
Reviewed-by: Christian Kandeler
Done-with: Friedemann Kleimt
Tobias Hunger [Tue, 29 Mar 2011 16:15:18 +0000 (18:15 +0200)]
Maemo: Make sure MaemoToolChains can not get cloned
It makes no sense to clone these!
Task-number: QTCREATORBUG-4256
Reviewed-by: Christian Kandeler
Thomas Hartmann [Thu, 31 Mar 2011 09:13:51 +0000 (11:13 +0200)]
QmlDesigner.propertyEditor: crash fix
The stack trace from 4282 indicates that in fact currentState is invalid.
We should check for this.
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4282
con [Thu, 31 Mar 2011 08:47:56 +0000 (10:47 +0200)]
Fix example git command.
Thomas Hartmann [Thu, 31 Mar 2011 08:37:45 +0000 (10:37 +0200)]
QmlDesigner.propertyEditor: crash fix for setting expressions
The problem was that the transaction was commited outside of the try {}
catch {} block (RAII)
1. I extended to the try block arround the fxObjectNode.setVariantProperty()
to avoid similar bugs
2. I force a commit of the transaction before leaving the try block
result:
If anything is wrong with the entered expression an exception is thrown
(like before) but now is is catched and we show a messagebox.
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4312
hjk [Thu, 31 Mar 2011 07:12:31 +0000 (09:12 +0200)]
toolchain configuration: hide unusable controls in 'disabled' state
Reviewed-By: Tobias Hunger
hjk [Thu, 31 Mar 2011 06:43:32 +0000 (08:43 +0200)]
projectexplorer: stretch toolchainview header
Reviewed-By: Tobias Hunger
hjk [Thu, 31 Mar 2011 06:38:49 +0000 (08:38 +0200)]
projectexplorer: make toolchain "Clone" option more obvious
Reviewed-By: Tobias Hunger
con [Thu, 31 Mar 2011 08:16:34 +0000 (10:16 +0200)]
FakeVim: Fix Ctrl+ shortcuts on Mac.
Wouldn't work if there also was a non-ctrl shortcut for the same key.
Task-number: QTCREATORBUG-3928
Reviewed-by: hjk
Jarek Kobus [Thu, 31 Mar 2011 07:57:24 +0000 (09:57 +0200)]
Update source strings
Reviewed-by: Pawel Polanski
Friedemann Kleint [Thu, 31 Mar 2011 07:35:32 +0000 (09:35 +0200)]
Compile.
Friedemann Kleint [Thu, 31 Mar 2011 06:59:04 +0000 (08:59 +0200)]
Designer/Go to slot: Match on source file in same folder.
preferably (there was a bug when source file of the same
name existed in several folders of the project).
Task-number: QTCREATORBUG-1880
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Alessandro Portale [Wed, 30 Mar 2011 19:22:20 +0000 (21:22 +0200)]
Bump the template version.
Just to make sure that users get the latest and greates fixes for
their projcts.
Alessandro Portale [Wed, 30 Mar 2011 16:32:22 +0000 (18:32 +0200)]
Double escaping backslashes for regular expression
The first parameter of qmake's replace function is a regular
expression. So it needs to be escaped once for the qmake parser,
and then for the regular expression.
Alessandro Portale [Wed, 30 Mar 2011 16:28:09 +0000 (18:28 +0200)]
Fix deployment with MinGW and sh.exe in path
When building with MinGW and sh.exe is in the path, we should/can
not use xcopy in our deployment code. This patch detects the
presence of sh.exe and adjusts the behavior accordingly.
'cp -r' is used directly instead of $(COPY_DIR), because the fix
for QTBUG-17315 is not yet in a released Qt version.
'mkdir -p' is used directly instead of $(MKDIR), because the
QMAKE_MKDIR for win32-g++ (in case of QMAKE_SH) does not have
the '-p'. A least not til Qt 4.7.3.
Task-Number: QTCREATORBUG-3094
Reviewed-by: Oswald Buddenhagen
hjk [Wed, 30 Mar 2011 16:50:58 +0000 (18:50 +0200)]
qr4projectmanager: improve appearance of RvctToolChainConfigWidget
Reviewed-by: Alessandro Portale
Christian Kandeler [Wed, 30 Mar 2011 14:41:20 +0000 (16:41 +0200)]
Maemo: If we find an icon, let's use it for the package manager.
In particular, the desktop icon created by the mobile wizards
will be found.
Task-number: QTCREATORBUG-4174
Jarek Kobus [Wed, 30 Mar 2011 14:31:31 +0000 (16:31 +0200)]
Update source strings
Friedemann Kleint [Wed, 30 Mar 2011 14:29:56 +0000 (16:29 +0200)]
Compile fix.
Tobias Hunger [Wed, 30 Mar 2011 13:47:51 +0000 (15:47 +0200)]
Fix update from GCCE and WINSCW set in Qt version
Fix the upgrade from GCCE and WINSCW from Qt version to
tool chain.
Task-number: QTCREATORBUG-4204
Reviewed-by: dt
Jarek Kobus [Wed, 30 Mar 2011 13:58:58 +0000 (15:58 +0200)]
Update source strings
Reviewed-by: Pawel Polanski
Olivier Goffart [Wed, 30 Mar 2011 12:22:52 +0000 (14:22 +0200)]
Compilation fixes with the QStringBuilder changes in Qt master
QStringBuilder also works with QByteArray now.
Which means some of the implicit conversions do not work anymore
Christian Kandeler [Wed, 30 Mar 2011 13:02:39 +0000 (15:02 +0200)]
Disable shadow builds on Windows for Fremantle and Harmattan as well.
Addendum to
8839031e60e77667ec3dd66c6f9af9c4672f1d57.
hjk [Wed, 30 Mar 2011 12:53:30 +0000 (14:53 +0200)]
debugger: remove 'Attach to TCF' start option
And TcfEngine etc.
Reviewed-by: Friedemann Kleint
hjk [Tue, 29 Mar 2011 12:17:30 +0000 (14:17 +0200)]
debugger: fix function name parsing from multi-breakpoints
Reviewed-By: Friedemann Kleint
hjk [Tue, 29 Mar 2011 11:17:01 +0000 (13:17 +0200)]
debugger: add tooltips to gdb settings window
Reviewed-by: Friedemann Kleint
con [Wed, 30 Mar 2011 12:58:05 +0000 (14:58 +0200)]
Workaround for Mac users with automatic proxy configuration
Qt's implementation for the Mac system configuration doesn't handle
automatic proxy configurations. Qt Creator now also looks at the
http_proxy environment variable on Mac as a workaround.
Task-number: QTCREATORBUG-4190
Reviewed-by: Daniel Molkentin
con [Wed, 30 Mar 2011 12:28:34 +0000 (14:28 +0200)]
Fix initial position of variable chooser.
It was showing up 'somewhere' depending on platform.
Task-number: QTCREATORBUG-4270
Reviewed-by: Robert Loehning
Kai Koehne [Wed, 30 Mar 2011 11:14:30 +0000 (13:14 +0200)]
QmlEngine: Enforce newline after status messages
Reviewed-by: hjk
Kai Koehne [Wed, 30 Mar 2011 11:04:54 +0000 (13:04 +0200)]
ApplicationOutput: Fix linkification of errors from qttest
Don't check for end of string (does contain LF in case of qttestlib).
Also don't check prefix for asserts, cause qttestlib extends these.
Reviewed-by: Tobias Hunger
Christian Kandeler [Wed, 30 Mar 2011 11:46:24 +0000 (13:46 +0200)]
Maemo: Polish publishing wizard.
Task-number: QTCREATORBUG-4257
Thomas Hartmann [Wed, 30 Mar 2011 10:21:06 +0000 (12:21 +0200)]
QmlDesigner: fix for duplicate ids
Duplicate ids for not handled 100% correctly in the property editor
and in the navigator.
Reviewed-by: Kai Koehne
Thomas Hartmann [Wed, 30 Mar 2011 10:19:42 +0000 (12:19 +0200)]
QmlDesigner.copyNPase: fix for components
Since the buffer for copy and paste has no proper
representation in the project managment QmlJs::Check cannot
handle components. For now we just turn of Check for this case, since
we check the final document anyway.
Reviewed-by: Kai Koehne
Thomas Hartmann [Wed, 30 Mar 2011 10:13:42 +0000 (12:13 +0200)]
QmlDesigner.formEditor: crashfix
Avoid recursion if item is not movable.
Reviewed-by: Kai Koehne
Task-Nr: http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4284
Oswald Buddenhagen [Wed, 30 Mar 2011 09:54:57 +0000 (11:54 +0200)]
add disk full error handling to consoleprocess
Friedemann Kleint [Wed, 30 Mar 2011 09:52:15 +0000 (11:52 +0200)]
Designer: Fix a crash when open() fails.
editorsClosed() is not emitted when open fails and thus
the file was not removed from FormEditorStack.
Add a connection from destroy to ensure the editor is removed.
Happens when loading a session whose files no longer exists.
Task-number: QTCREATORBUG-4266
Reviewed-by: dt