OSDN Git Service
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
Christian Kandeler [Wed, 30 Mar 2011 09:39:40 +0000 (11:39 +0200)]
QML plugin wizard: Fix deprecated use of backslash in project file.
Task-number: QTCREATORBUG-4091
Christian Kandeler [Tue, 29 Mar 2011 14:10:05 +0000 (16:10 +0200)]
Maemo: Filter NUL characters from rrpmbuild output.
dt [Wed, 30 Mar 2011 09:20:18 +0000 (11:20 +0200)]
ProjectExplorer: DeployStepsPage avoid callign init() twice
Reviewed-By: hunger
Oswald Buddenhagen [Wed, 30 Mar 2011 08:47:43 +0000 (10:47 +0200)]
exclude plist.in files from the copy targets
they are handled by QMAKE_SUBSTITUTES where needed
Reviewed-by: con
Oswald Buddenhagen [Tue, 29 Mar 2011 09:32:41 +0000 (11:32 +0200)]
add README explaining purpose of src/share/
Reviewed-by: con
Oswald Buddenhagen [Tue, 29 Mar 2011 09:26:10 +0000 (11:26 +0200)]
nothing mac-specific about OTHER_FILES
Reviewed-by: con
Oswald Buddenhagen [Tue, 29 Mar 2011 09:25:43 +0000 (11:25 +0200)]
install data from src/share/ directory
Reviewed-by: con
Oswald Buddenhagen [Tue, 29 Mar 2011 09:25:24 +0000 (11:25 +0200)]
reshuffle and simplify copying of files from src/share/
Reviewed-by: con
con [Tue, 29 Mar 2011 15:54:15 +0000 (17:54 +0200)]
Fix crash when filtering in the preferences.
Need to ensure creation of all tabs before even the proxy model is
informed.
Task-number: QTCREATORBUG-4272
Reviewed-by: Robert Loehning
con [Mon, 28 Mar 2011 13:31:27 +0000 (15:31 +0200)]
Automatic versioning for the qml tools.
Reviewed-by: Thomas Hartmann
Leena Miettinen [Tue, 29 Mar 2011 14:52:54 +0000 (16:52 +0200)]
Doc: fix qdoc tags
Leena Miettinen [Tue, 29 Mar 2011 14:17:21 +0000 (16:17 +0200)]
Doc: required Python version
Reviewed-by: hjk
Leena Miettinen [Tue, 29 Mar 2011 14:16:51 +0000 (16:16 +0200)]
Doc: specifying canvas size and refreshing the canvas
Hide information about displaying MeeGo and Symbian components.
Update screen shots.
Reviewed-by: Thomas Hartmann
Friedemann Kleint [Tue, 29 Mar 2011 13:12:42 +0000 (15:12 +0200)]
Debugger: Hide/Show pinneable tooltips on de/iconifying main window.
Reviewed-by: hjk
Task-number: QTCREATORBUG-4207
Friedemann Kleint [Tue, 29 Mar 2011 12:45:21 +0000 (14:45 +0200)]
Analyzer: Fix a crash when launching on a QML project.
Which does not have a build configuration.
Reviewed-by: Bill King <bill.king@nokia.com>
Christian Kandeler [Tue, 29 Mar 2011 12:41:41 +0000 (14:41 +0200)]
Mobile app wizard: Fix desktop file contents.
The "Exec" value was not consistent with the installation prefix in the
.pri file.
Christian Kandeler [Tue, 29 Mar 2011 12:11:08 +0000 (14:11 +0200)]
Meego: We still needed an additional option for rpm...
Replacing files is dangerous, but otherwise we'd have to e.g. change
the spec file's "Release" field on every deployment, which would
be annoying for the user.
Christian Kandeler [Tue, 29 Mar 2011 10:47:52 +0000 (12:47 +0200)]
Maemo: Adapt changes file.
Christian Kandeler [Tue, 29 Mar 2011 10:16:46 +0000 (12:16 +0200)]
Meego: Allow re-installation of RPM package.
This is a backport of
34030efbc45bbdc2300c724219d01c1a024d4cff.
Christian Kandeler [Tue, 29 Mar 2011 09:53:19 +0000 (11:53 +0200)]
Maemo: Fix package renaming for Debian.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=235909
Leandro Melo [Tue, 29 Mar 2011 08:55:36 +0000 (10:55 +0200)]
Fix Shift modifier handling in shortcuts with numbers
We assume a number can always be reached without the
Shift modifier, so we keep the Shift modifier if we
see it.
Task-number: QTCREATORBUG-4227
Reviewed-by: con
Christian Kandeler [Tue, 29 Mar 2011 08:43:39 +0000 (10:43 +0200)]
Maemo: Make device config wizard create key directory if necessary.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=234300
hjk [Tue, 29 Mar 2011 07:58:21 +0000 (09:58 +0200)]
debugger: Merge 'fork' and 'vfork' breakpoints
Reviewed-by: Friedemann Kleint
Friedemann Kleint [Tue, 29 Mar 2011 07:56:40 +0000 (09:56 +0200)]
Debugger[CDB]: Fix CDB not showing QList<const char*>.
as it cannot determine the size of 'char const*' which it
reports as type.
Reviewed-by: hjk
Task-number: QTCREATORBUG-4253
Christian Kandeler [Tue, 29 Mar 2011 06:40:21 +0000 (08:40 +0200)]
Maemo: No automatic test for new Qemu device configuration.
It is very unlikely that the emulator is already running.
dt [Mon, 28 Mar 2011 16:32:49 +0000 (18:32 +0200)]
Maemo: Disable shadow building on windows again
Task-Nr: QTCREATORBUG-4255
Reviewed-By: Robert Loehning
dt [Mon, 28 Mar 2011 15:08:24 +0000 (17:08 +0200)]
Local Application Run Control: emit finished() for non existent programs
Ensures the corect state is reflected for the run actions.
Reviewed-By: hunger
Leena Miettinen [Mon, 28 Mar 2011 14:21:37 +0000 (16:21 +0200)]
Doc: trigger code completion by pressing Tab or Enter
Reviewed-by: Leandro Melo
Oswald Buddenhagen [Mon, 28 Mar 2011 12:50:32 +0000 (14:50 +0200)]
support tilde expansion under unix
Task-number: QTCREATORBUG-4239
dt [Mon, 28 Mar 2011 13:06:14 +0000 (15:06 +0200)]
Fix Close all to not depend on being buildable
Task-Nr: QTCREATORBUG-4241
Task-Nr: QTCREATORBUG-3995
Reviewed-By: kkoehne
con [Mon, 28 Mar 2011 11:35:43 +0000 (13:35 +0200)]
Fix progress bar for searching in files.
Affects e.g. Advanced Find->All Projects. Progress bar was not updating
at all, except at the end of the search.
The fix is a workaround for regression in
QFutureInterface::isProgressUpdateNeeded that would no longer return
true the very first time in Qt 4.7. To be reverted when this is fixed
in a released Qt version.
Reviewed-by: dt
dt [Mon, 28 Mar 2011 12:30:02 +0000 (14:30 +0200)]
Navigation Tree View: Fix width of column
We want to have the width both to be at least the contents size
but also stretch to width of the viewport.
Reviewed-By: con
Thomas Hartmann [Mon, 28 Mar 2011 12:27:18 +0000 (14:27 +0200)]
QmlDesigner.metaInfo: fix for enums
Non existing properties are not enums.
Fixes some rewriting errors in combination with
PropertyChanges.
Reviewed-by: Kai Koehne
Kai Koehne [Mon, 28 Mar 2011 10:30:18 +0000 (12:30 +0200)]
QmlDebug: Fix handling of QML stack trace locations on Windows
Remove leading slash.
hjk [Mon, 28 Mar 2011 09:18:56 +0000 (11:18 +0200)]
fakevim: update search history after <Esc> in incremental search
hjk [Mon, 28 Mar 2011 08:45:47 +0000 (10:45 +0200)]
fakevim: fix :s, :d, :>, and :< in case of empty line specs
dt [Fri, 25 Mar 2011 16:20:27 +0000 (17:20 +0100)]
Qt4Project: Don't show a error on initial building
hjk [Fri, 25 Mar 2011 16:21:28 +0000 (17:21 +0100)]
version bump to 2.1.83
dt [Fri, 25 Mar 2011 16:00:15 +0000 (17:00 +0100)]
TargetSetupPage: Enable the target page on add import
Task-Nr: QTCREATORBUG-4230
Thomas Hartmann [Fri, 25 Mar 2011 14:30:11 +0000 (15:30 +0100)]
QmlDesigner.formEditor: crash fix
We have to Guard events. The Formeditor has to be fully initialized.
Task-Nr: QTCREATORBUG-4225
Friedemann Kleint [Fri, 25 Mar 2011 12:50:35 +0000 (13:50 +0100)]
Debugger[CDB]: Detect 64bit Debugging tools in 32bit executables.
Current version fails on some setups, check all postfixes.
Task-number: QTCREATORBUG-4213
dt [Thu, 24 Mar 2011 19:44:46 +0000 (20:44 +0100)]
Qt4Project: do not show a error on make clean without a Makefile
Task-Nr:
dt [Thu, 24 Mar 2011 18:58:22 +0000 (19:58 +0100)]
ProjectExplorer: Fix compile on linux
dt [Thu, 24 Mar 2011 18:45:19 +0000 (19:45 +0100)]
QmakeStep: Warn once for missing toolchains
dt [Thu, 24 Mar 2011 18:27:29 +0000 (19:27 +0100)]
Target setup page: 2. message box parent
Give the other message box the right parent too.
Task-Nr: QTCREATORBUG-4192
Daniel Molkentin [Thu, 24 Mar 2011 16:05:51 +0000 (17:05 +0100)]
Calculate proper size hint for target Creator.
Task-Number: QTCREATORBUG-4172
Reviewed-by: Robert Loehning
Thomas Hartmann [Thu, 24 Mar 2011 15:31:24 +0000 (16:31 +0100)]
QmlDesigner.propertyEditor: bug fix for color editing
Task-Nr: QTCREATORBUG-4069
Thomas Hartmann [Thu, 24 Mar 2011 15:04:05 +0000 (16:04 +0100)]
QmlDesigner.propertyEditor: bug fix for Rectangle.border
Task-Nr: QTCREATORBUG-2960
Thomas Hartmann [Thu, 24 Mar 2011 14:12:14 +0000 (15:12 +0100)]
QmlDesigner.propertyEditor: fix for the filewidget
The combobox showing all available files did not work.
Tobias Hunger [Thu, 24 Mar 2011 13:35:03 +0000 (14:35 +0100)]
Handle tool chain configuration changes
Reviewed-by: dt
Tobias Hunger [Thu, 24 Mar 2011 13:15:00 +0000 (14:15 +0100)]
RVCT: Speed up detection of version
Speed up detection of version information of RVCT. This is especially
relevant for people with wrong license server information as that causes
creator to wait for a timeout!
Reviewed-by: dt
Tobias Hunger [Thu, 24 Mar 2011 12:27:26 +0000 (13:27 +0100)]
Add toolChainUpdated signal
Add toolChainUpdated(ToolChain *) to ToolChainManager and make
sure it is triggered in the right places.
Reviewed-by: dt
Tobias Hunger [Thu, 24 Mar 2011 11:43:45 +0000 (12:43 +0100)]
Do not try to build in Qt4 makestep without a tool chain
Reviewed-by: dt
Tobias Hunger [Thu, 24 Mar 2011 10:58:40 +0000 (11:58 +0100)]
Crash: Fix crash when removing a tool chain
Fix crash on trying to debug an application after the last
tool chain for the Qt version used was removed.
Task-number: QTCREATORBUG-4197
Reviewed-by: dt
Tobias Hunger [Wed, 23 Mar 2011 14:25:38 +0000 (15:25 +0100)]
Abi: Add unit test for arm linux libraries
Reviewed-by: dt
Tobias Hunger [Tue, 22 Mar 2011 15:49:58 +0000 (16:49 +0100)]
Only build and use MSVC on windows
Reviewed-by: dt
hjk [Wed, 23 Mar 2011 12:06:16 +0000 (13:06 +0100)]
debugger: recognize more types as integral
hjk [Wed, 23 Mar 2011 11:16:37 +0000 (12:16 +0100)]
debugger: change layout of the "Change Display Format..." context submenu
Christiaan Janssen [Mon, 28 Feb 2011 09:58:21 +0000 (10:58 +0100)]
QmlDebugger: user input on watches
Reviewed-by: hjk
Christiaan Janssen [Wed, 23 Feb 2011 15:09:56 +0000 (16:09 +0100)]
QmlDebugger: Watchers
Reviewed-by: hjk
dt [Thu, 24 Mar 2011 12:00:18 +0000 (13:00 +0100)]
Open Recent Project: Do not show misleading error dialog
The return code of openProject() just indicates if a project was opened.
That is also false if the user cancels the open process.
Task-Nr: QTCREATORBUG-4173
Thomas Hartmann [Thu, 24 Mar 2011 10:15:04 +0000 (11:15 +0100)]
QmlDesigner.qmlPuppet: try to restart after 2 seconds.
10 seconds were a little bit too long.
Thomas Hartmann [Thu, 24 Mar 2011 10:14:21 +0000 (11:14 +0100)]
QmlDesigner.qmlPuppet: avoid debug error messages boxes
Wit this patch all crashes of qmldump are silent
now (in release mode).
This means Qt Quick Designer will just (silently) recover.
Reviewed-by: Kai Koehne
Thomas Hartmann [Thu, 24 Mar 2011 09:07:02 +0000 (10:07 +0100)]
QmlDesigner.propertyEditor: add specifics for Flickable
The Flickable item has to be be useable in the property editor.
Thomas Hartmann [Thu, 24 Mar 2011 09:06:10 +0000 (10:06 +0100)]
QmlDesigner.propertyEditor: fixes a style issue
The ToolButton color has to be be light gray
instead of black (too hard to read).
Task-number: QTCREATORBUG-4070
Kai Koehne [Thu, 24 Mar 2011 08:30:06 +0000 (09:30 +0100)]
QDeclarativeDebug: Fix when client with ongoing queries is deleted
Will also be fixed in QtDeclarative / 4.8.
Reviewed-by: Christiaan Janssen
Thomas Hartmann [Wed, 23 Mar 2011 16:38:28 +0000 (17:38 +0100)]
QmlDesigner.plugins: updating item library
Thomas Hartmann [Wed, 23 Mar 2011 16:38:09 +0000 (17:38 +0100)]
QmlDesigner.anchors: avoid recursion
Since instances are asynchronius now, we cannot
rely on instance feedback (for e.g. fill).
This beautification code has to be rewritten using the model.
Reviewed-by: Kai Koehne
Thorbjørn Lindeijer [Wed, 23 Mar 2011 16:24:07 +0000 (17:24 +0100)]
QmlJSDebugger: Disabled the Qt Quick tool box entirely for now
This tool box doesn't add much value since the same actions are
available from Qt Creator and in the case of using the Observer, some
actions are also available from its menus.
Reviewed-by: Kai Koehne
Leena Miettinen [Wed, 23 Mar 2011 16:15:20 +0000 (17:15 +0100)]
Doc: Valgrind Memcheck integration
Reviewed-by: hjk
Leena Miettinen [Wed, 23 Mar 2011 15:42:49 +0000 (16:42 +0100)]
Doc: update version numbers
Leena Miettinen [Wed, 23 Mar 2011 15:42:34 +0000 (16:42 +0100)]
Doc: adding tool chains
Update all sections related to target setting.
Leena Miettinen [Wed, 23 Mar 2011 13:01:11 +0000 (14:01 +0100)]
Doc: update screen shots
Leena Miettinen [Wed, 23 Mar 2011 13:00:35 +0000 (14:00 +0100)]
Doc: changes to opening projects
Reviewed-by: dt
Daniel Molkentin [Tue, 15 Mar 2011 17:57:50 +0000 (18:57 +0100)]
Better wording: Both options cause a pane to show up at a specific incident.
Reviewed-by: Leena Miettinen
Daniel Molkentin [Wed, 23 Mar 2011 15:18:03 +0000 (16:18 +0100)]
unbreak build: add required header files