OSDN Git Service
Oswald Buddenhagen [Mon, 4 Apr 2011 13:24:13 +0000 (15:24 +0200)]
add errorString output argument to IFile::reload() & IEditor::open()
add/unify read error handling in all affected classes
Oswald Buddenhagen [Wed, 30 Mar 2011 11:45:16 +0000 (13:45 +0200)]
add errorString output argument to IFile::save()
this centralizes error reporting (in fact, in most cases it adds any in
the first place).
Task-number: QTCREATORBUG-1619
Oswald Buddenhagen [Wed, 30 Mar 2011 10:43:17 +0000 (12:43 +0200)]
abort commit if commit message cannot be saved
Oswald Buddenhagen [Wed, 30 Mar 2011 11:46:57 +0000 (13:46 +0200)]
remove superfluous argument
no need to pass in the current file name
Oswald Buddenhagen [Wed, 30 Mar 2011 10:38:12 +0000 (12:38 +0200)]
file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange()
this replaces the ever-repeating idiom block/save/unblock with a single
call.
Oswald Buddenhagen [Wed, 30 Mar 2011 10:06:05 +0000 (12:06 +0200)]
add fileutils: classes for error-checked reading and writing of files
the internal use of SaveFile ensures that we don't leave truncated
pre-existing files behind if the disk is full or something else bad
happens.
Task-number: QTCREATORBUG-1619
Oswald Buddenhagen [Wed, 30 Mar 2011 10:07:47 +0000 (12:07 +0200)]
add Utils::SaveFile: class for atomic saving of files
inspired by KSaveFile
Oswald Buddenhagen [Mon, 4 Apr 2011 13:34:04 +0000 (15:34 +0200)]
remove redundant error check
no point in checking for file's existence before opening it - the
errorString is verbose enough.
Oswald Buddenhagen [Mon, 4 Apr 2011 13:37:31 +0000 (15:37 +0200)]
better error messages
it's only qWarning()s, but anyway ...
Oswald Buddenhagen [Mon, 4 Apr 2011 13:36:39 +0000 (15:36 +0200)]
use QFile::open()'s return value instead of using weird isOpen() checks
Oswald Buddenhagen [Mon, 4 Apr 2011 12:55:03 +0000 (14:55 +0200)]
don't re-implement QDir::canonicalFilePath() by hand
Oswald Buddenhagen [Mon, 4 Apr 2011 13:31:30 +0000 (15:31 +0200)]
make addOutput() signal const
it doesn't change the emitting object
Oswald Buddenhagen [Thu, 14 Apr 2011 18:32:13 +0000 (20:32 +0200)]
GUI style fixes: spaces before ellipses and excess ellipses
con [Mon, 18 Apr 2011 11:57:18 +0000 (13:57 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
con [Mon, 18 Apr 2011 11:57:07 +0000 (13:57 +0200)]
Merge remote branch 'origin/2.2'
Conflicts:
qtcreator.pri
src/plugins/debugger/breakhandler.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
Friedemann Kleint [Mon, 18 Apr 2011 11:01:12 +0000 (13:01 +0200)]
Run/Debug: Do not launch on a library project if user cancels
the executable dialog that pops up.
Reviewed-by: dt
con [Mon, 18 Apr 2011 10:30:15 +0000 (12:30 +0200)]
Update version number.
Friedemann Kleint [Mon, 18 Apr 2011 10:25:08 +0000 (12:25 +0200)]
Debugger[gdb]: Locate objdump in MinGW for release build check.
Sergey Belyashov [Mon, 18 Apr 2011 10:18:09 +0000 (12:18 +0200)]
Small correction of Russian translation
Merge-request: 293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Mon, 18 Apr 2011 09:51:44 +0000 (11:51 +0200)]
Debugger: Reduce log severity of locals errors.
Preventing the log view from popping up.
Task-number: QTCREATORBUG-4524
Reviewed-by: hjk
Roberto Raggi [Mon, 18 Apr 2011 09:00:23 +0000 (11:00 +0200)]
Fix possible crash when parsing layout qualifiers nodes.
Task-number: QTCREATORBUG-4563
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Tobias Hunger [Fri, 15 Apr 2011 15:34:13 +0000 (17:34 +0200)]
WINSCW: Fix bit width of WINSCW ABIs
This should unbreak WINSCW support
Task-number: QTCREATORBUG-4560
Reviewed-by: Robert Loehning
Thomas Hartmann [Mon, 18 Apr 2011 08:26:52 +0000 (10:26 +0200)]
QmlDesigner.propertyEditor: crash fix
Setting an empty expression on a value not defined in the model
crashed.
Task-number: QTCREATORBUG-4312
Friedemann Kleint [Mon, 18 Apr 2011 07:42:07 +0000 (09:42 +0200)]
Project wizard page: Fix layout.
Friedemann Kleint [Mon, 18 Apr 2011 06:55:00 +0000 (08:55 +0200)]
HTML5 wizard: Compile on Linux/warnings.
Alessandro Portale [Sun, 17 Apr 2011 07:59:16 +0000 (09:59 +0200)]
Merge touchnavigation code into html5applicationviewer.cpp
The touchnavigation code had been splitted for easier development.
But we do not want the wizard to generate those many files. The
Wizard takes care of that and merges all into one.
Alessandro Portale [Sun, 17 Apr 2011 07:57:07 +0000 (09:57 +0200)]
Fix the main .qml gile generation in the manual test.
Alessandro Portale [Sun, 17 Apr 2011 07:56:25 +0000 (09:56 +0200)]
Fix abstractmobileapp build for the manual test
Alessandro Portale [Sun, 17 Apr 2011 07:55:17 +0000 (09:55 +0200)]
Include touchnavigation.pri from main .pro file
And have that entry removed by the wizard. REMOVE_NEXT_LINE
is now the keyword for line removal. INCLUDE_DEPLOYMENT_PRI
was replaced by REMOVE_NEXT_LINE.
Keith Kyzivat [Sat, 16 Apr 2011 03:27:45 +0000 (23:27 -0400)]
Split out touch navigation into separate files.
Make the html5applicationviewer class much less cluttered by splitting out all
the touch navigation classes into separate files in a subdirectory.
This should make it much more maintainable.
con [Fri, 15 Apr 2011 14:43:47 +0000 (16:43 +0200)]
Fix %{CurrentProject:Path}
Was returning the same as %{CurrentProject:FilePath}
Task-number: QTCREATORBUG-4533
Reviewed-by: Robert Loehning
Sergey Belyashov [Fri, 15 Apr 2011 18:31:15 +0000 (20:31 +0200)]
Updated Russian translation
Merge-request: 290
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tobias Hunger [Fri, 15 Apr 2011 15:43:44 +0000 (17:43 +0200)]
VCS: Notify project wizard about config changes
... and have the project wizard update the available VCS.
Task-number: QTCREATORBUG-4423
Tobias Hunger [Fri, 15 Apr 2011 15:07:15 +0000 (17:07 +0200)]
Fix warning about non-virtual destructor
Tobias Hunger [Fri, 15 Apr 2011 15:05:56 +0000 (17:05 +0200)]
Cleanup: Remove unnecessary virtual keywords
Tobias Hunger [Fri, 15 Apr 2011 14:39:22 +0000 (16:39 +0200)]
ProjectWizard: Add button to take you to VCS configuration
This makes setting up VCS more discoverable.
Christiaan Janssen [Fri, 15 Apr 2011 14:26:44 +0000 (16:26 +0200)]
QmlDebugger: parsing packets iteratively in the communication protocol
Reviewed-by: Kai Koehne
Christiaan Janssen [Fri, 15 Apr 2011 13:49:54 +0000 (15:49 +0200)]
QmlProfiler: fixed arguments for qmlobserver when profiling
Reviewed-by: Kai Koehne
Christiaan Janssen [Fri, 15 Apr 2011 12:51:49 +0000 (14:51 +0200)]
QmlProfiler: fixed connection reset when new application starts
Reviewed-by: Kai Koehne
Christian Kandeler [Fri, 15 Apr 2011 15:06:34 +0000 (17:06 +0200)]
Maemo: Fix section name in Debian control file.
It's "user/other" for Harmattan, apparently...
Friedemann Kleint [Fri, 15 Apr 2011 14:40:08 +0000 (16:40 +0200)]
FileWatcher: Use Utils::FileSystemWatcher in Core::FileManager.
for everything except links on UNIX, further reducing shutdown time.
Friedemann Kleint [Fri, 15 Apr 2011 14:10:03 +0000 (16:10 +0200)]
Compile.
Tobias Hunger [Fri, 15 Apr 2011 14:02:44 +0000 (16:02 +0200)]
VCS: Do not claim to support any operation if unconfigured
Make sure none of the VCS systems claims it does support any
VCS operation while unconfigured. This stops the specific
VCS from showing up in wizards, etc. till they can actually
be used.
Tobias Hunger [Fri, 15 Apr 2011 13:09:49 +0000 (15:09 +0200)]
SVN: Remove useless virtual keywords and members
Tobias Hunger [Fri, 15 Apr 2011 13:06:21 +0000 (15:06 +0200)]
CVS: Remove useless virtual keywords and members
Tobias Hunger [Fri, 15 Apr 2011 12:59:48 +0000 (14:59 +0200)]
Git: Remove useless virtual keywords
Tobias Hunger [Fri, 15 Apr 2011 12:00:54 +0000 (14:00 +0200)]
Perforce: Remove useless virtual keywords
Friedemann Kleint [Fri, 15 Apr 2011 13:55:11 +0000 (15:55 +0200)]
Utils: Introduce FileSystemWatcher.
Remove duplicated classes ProjectExplorer::FileWatcher
and QmlProjectManager::FileSystemWatcher, create
Utils::FileSystemWatcher from them, merging the functionality.
Also use in HelpManager/Maemo, reducing the number
of QFileSystemWatcher instances (and thus, shutdown time).
Leena Miettinen [Fri, 15 Apr 2011 12:52:49 +0000 (14:52 +0200)]
Doc: update screen shot
Leena Miettinen [Thu, 14 Apr 2011 12:56:19 +0000 (14:56 +0200)]
Doc: Analysis pane in the Viewing Output section
Christian Kandeler [Fri, 15 Apr 2011 12:20:04 +0000 (14:20 +0200)]
Maemo: Detect unexpected gdbserver exit.
Task-number: QTCREATORBUG-4535
dt [Fri, 15 Apr 2011 10:34:55 +0000 (12:34 +0200)]
TargetSetupPage: Hide "add Build" for shadow incapble targets
There can't be any builds anywhere
Reviewed-By: hunger
dt [Fri, 15 Apr 2011 10:34:06 +0000 (12:34 +0200)]
Qt4BuildConfiguration: Changing qt versions affects the environment
Reviewed-By: hunger
dt [Fri, 15 Apr 2011 10:33:31 +0000 (12:33 +0200)]
QtVersionManager: Detect changes in sbs/system root settings
Otherwise the Qt options dialog won't emit a signal if just those paths
are changed in the settings.
Reviewed-By: hunger
Tobias Hunger [Fri, 15 Apr 2011 10:28:31 +0000 (12:28 +0200)]
Utils: Fix possible crash in SynchronousProcess
Disconnect before deleting our data: Otherwise we will get called
via our signals again and then access members that were already
deleted.
Task-number: QTCREATORBUG-4361
Reviewed-by: Friedemann Kleint
(cherry picked from commit
72ae03ba808157f48b769cd04a9aa7ed48342be3)
Tobias Hunger [Fri, 15 Apr 2011 10:28:31 +0000 (12:28 +0200)]
Utils: Fix possible crash in SynchronousProcess
Disconnect before deleting our data: Otherwise we will get called
via our signals again and then access members that were already
deleted.
Task-number: QTCREATORBUG-4361
Reviewed-by: Friedemann Kleint
hjk [Thu, 14 Apr 2011 14:10:18 +0000 (16:10 +0200)]
debugger: silence debug output for unrecognized temporary breakpoints
Thomas Hartmann [Fri, 15 Apr 2011 10:39:54 +0000 (12:39 +0200)]
QmlDesigner.symbianPlugin: fix for BusyIndicator
BusyIndicator does nto have a property text.
Thomas Hartmann [Thu, 14 Apr 2011 15:02:00 +0000 (17:02 +0200)]
QmlTextEditor: new icons for outline
Thomas Hartmann [Wed, 13 Apr 2011 15:52:17 +0000 (17:52 +0200)]
QmlDesigner.nodeInstances: show warning if qml pupped crashes
If the qml puppetcrahes 3 times in a row we show a warning.
Reviewed-by: Marco Bubke
Thomas Hartmann [Wed, 13 Apr 2011 15:50:39 +0000 (17:50 +0200)]
QmlDesigner.meegoPlugin: update meta info
Thomas Hartmann [Wed, 13 Apr 2011 15:50:08 +0000 (17:50 +0200)]
QmlDesigner.meegoPlugin: fix qrc warnings
Tobias Hunger [Fri, 15 Apr 2011 10:27:45 +0000 (12:27 +0200)]
TaskList: Clean up reopen behavior
Thanks to Ossi for pointing out the errors in my way.
Friedemann Kleint [Fri, 15 Apr 2011 09:43:09 +0000 (11:43 +0200)]
Core: Supppress 'WhatsThis' in dialogs.
Pawel Polanski [Fri, 15 Apr 2011 08:54:41 +0000 (10:54 +0200)]
CodaClient now supports uninstallation
Pawel Polanski [Fri, 15 Apr 2011 08:54:13 +0000 (10:54 +0200)]
CODA: Added uninstallation feature
Friedemann Kleint [Fri, 15 Apr 2011 09:27:15 +0000 (11:27 +0200)]
Wizards: Make it possible to check existing files to overwrite.
Present a checkable list of files to be overwritten,
enabling re-generating a part of the project or class.
Task-number: QTCREATORBUG-4538
Kai Koehne [Fri, 15 Apr 2011 07:35:54 +0000 (09:35 +0200)]
QmlProfiler: Fix crash on application exit
The disconnectClient might be called when the last packet
of data arrives, which means we're deleting the connection
while it's readyRead() method is still running. Avoid this
by using deleteLater().
Reviewed-by: Christiaan Janssen
Kai Koehne [Fri, 15 Apr 2011 07:01:34 +0000 (09:01 +0200)]
QmlProfiler: Fix slot signature
Kai Koehne [Fri, 15 Apr 2011 06:55:55 +0000 (08:55 +0200)]
QmlProfiler: Fix compiler warning
Fix "format ‘%d’ expects type ‘int’, but argument 3 has type ‘quint64’"
Oswald Buddenhagen [Mon, 4 Apr 2011 12:31:10 +0000 (14:31 +0200)]
remove dead code
Oswald Buddenhagen [Wed, 30 Mar 2011 14:04:48 +0000 (16:04 +0200)]
don't clobber encoding on rewriting file
Oswald Buddenhagen [Mon, 4 Apr 2011 13:03:49 +0000 (15:03 +0200)]
show error string instead of error code ...
Oswald Buddenhagen [Thu, 14 Apr 2011 19:07:13 +0000 (21:07 +0200)]
don't ignore file changes while reload dialog is up
we cannot clear the list of modified files after possibly entering the main
loop again, as that might discard new notifications which we have not
processed yet.
Reviewed-by: dt
Christian Kandeler [Thu, 14 Apr 2011 09:25:52 +0000 (11:25 +0200)]
struct -> class
Reviewed-by: Tobias Hunger
Kai Koehne [Thu, 14 Apr 2011 15:19:28 +0000 (17:19 +0200)]
QmlProfiler: Reinstantiate a QDDClient for every new connection
Kai Koehne [Thu, 14 Apr 2011 15:18:32 +0000 (17:18 +0200)]
QmlProfiler: Make use of QSharedPointer for TracePlugin
THe plugin might be deleted when the client is deleted.
Kai Koehne [Thu, 14 Apr 2011 15:14:26 +0000 (17:14 +0200)]
QmlProfiler: Use ApplicationLauncher instead of QProcess
Kai Koehne [Thu, 14 Apr 2011 13:49:12 +0000 (15:49 +0200)]
QmlProfiler: Remove use of Qt private headers
Use the copy of QDeclarativeDebugClient we ship with qtcreator.
However, since the internal one misses a waitForConnected any connection
will right now fail.
Kai Koehne [Wed, 13 Apr 2011 13:47:13 +0000 (15:47 +0200)]
QmlDebug: Fix debugging on local machine
Fix regression in that it always assumed that you want to debug
Symbian (over USB).
Kai Koehne [Tue, 12 Apr 2011 15:24:56 +0000 (17:24 +0200)]
QmlProfiler: Enable on Windows
Replace use of sleep() call with a timer.
Tobias Hunger [Thu, 14 Apr 2011 15:29:34 +0000 (17:29 +0200)]
GCCE: Use make.exe on windows
Use make.exe (not make) on windows to match what RVCT does. This is
a cosmetic change to stop percieved flickering when switching between
RVCT and GCCE tool chains.
Tobias Hunger [Thu, 14 Apr 2011 15:23:48 +0000 (17:23 +0200)]
Update makestep on toolchain changes
This way the makestep configuration widget's details will reflect
the actual arguments used.
Tobias Hunger [Thu, 14 Apr 2011 15:23:35 +0000 (17:23 +0200)]
small WS cleanup
Friedemann Kleint [Thu, 14 Apr 2011 14:57:40 +0000 (16:57 +0200)]
Core: Create link file watcher on demand.
As deletion of a QFileSystemWatcher is expensive on Linux
and has an impact on shutdown.
Friedemann Kleint [Thu, 14 Apr 2011 14:29:00 +0000 (16:29 +0200)]
Maemo: Create file watchers on demand.
As QFileSystemWatcher cause some shutdown time.
Rubber-stamped-by: Christian Kandeler <christian.kandeler@nokia.com>
Christiaan Janssen [Thu, 14 Apr 2011 14:05:41 +0000 (16:05 +0200)]
QmlProfiler: Fixing regression for non-recording runs
Reviewed-by: Kai Koehne
Christiaan Janssen [Thu, 14 Apr 2011 13:44:43 +0000 (15:44 +0200)]
QmlProfiler: user defined host:port
Reviewed-by: Kai Koehne
Tobias Hunger [Thu, 14 Apr 2011 09:36:16 +0000 (11:36 +0200)]
Fix upgrade of Symbian Qt versions from 2.1
SBSv2 support has changed a bit.
Reviewed-by: Pawel Polanski
Tobias Hunger [Wed, 13 Apr 2011 14:45:38 +0000 (16:45 +0200)]
Set debugger when importing tool chains from old settings
Set the default debugger when importing tool chains from old
settings. We just left the field blank before.
Task-number: QTCREATORBUG-4482
Reviewed-by: dt
Christiaan Janssen [Thu, 14 Apr 2011 13:23:17 +0000 (15:23 +0200)]
QmlProfiler: stop timer on failed connection
Reviewed-by: Kai Koehne
Tobias Hunger [Thu, 14 Apr 2011 12:53:45 +0000 (14:53 +0200)]
ToolChain: Make sure we have a proper tool chain
Make sure we have a proper tool chain when restoring a project.
Tobias Hunger [Thu, 14 Apr 2011 12:52:28 +0000 (14:52 +0200)]
Qt4Bc: Do not store/restore tool chains
The plain BuildConfiguration aleady does that for us.
Tobias Hunger [Thu, 14 Apr 2011 12:51:28 +0000 (14:51 +0200)]
Gcc: Cause less update signals to be sent
Cause less update signals to be sent when changing the compiler path.
Tobias Hunger [Thu, 14 Apr 2011 12:49:50 +0000 (14:49 +0200)]
Gcc: Update Id when debugger path changes
This unconfuses restoration of some tool chains.
Tobias Hunger [Thu, 14 Apr 2011 12:48:14 +0000 (14:48 +0200)]
ToolChain: Remove invalid toolchain when not needed
Remove the invalid toolchain from the combobox when it is no longer needed.
Tobias Hunger [Thu, 14 Apr 2011 08:50:28 +0000 (10:50 +0200)]
GCC: Move ABI in front of debugger again
In toolchain configuration widget: Move abi in front of debugger again
hjk [Thu, 14 Apr 2011 11:32:30 +0000 (13:32 +0200)]
projectexplorer: s/IPropertiesPanel/PropertiesPanel. No need for subclassing.
hjk [Thu, 14 Apr 2011 10:28:21 +0000 (12:28 +0200)]
core: make mode creation more uniform
dt [Thu, 14 Apr 2011 11:03:00 +0000 (13:03 +0200)]
TargetSetupPage: setBuildConfiguraionComboBoxVisible use the parameter
Instead of assuming that it is true. (Which is actually true, but well.)