OSDN Git Service

qt-creator-jp/qt-creator-jp.git
12 years agoMake Components installable. Fix Shadow Build.
Daniel Molkentin [Tue, 2 Aug 2011 15:11:29 +0000 (17:11 +0200)]
Make Components installable. Fix Shadow Build.

Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoQmlDesigner.rewriter: bugfix for components
Thomas Hartmann [Wed, 3 Aug 2011 13:58:23 +0000 (15:58 +0200)]
QmlDesigner.rewriter: bugfix for components

Simplifying synchronisation of m_componentEndOffset. Fixes several
rewriting issues.

Change-Id: I53a7f4ae8af1acb05e4daff6afdeec9522d35a79
Reviewed-on: http://codereview.qt.nokia.com/2572
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDesigner.rewriter: allow more debuging info
Thomas Hartmann [Wed, 3 Aug 2011 13:31:19 +0000 (15:31 +0200)]
QmlDesigner.rewriter: allow more debuging info

Change-Id: I8e4571ac5a8a0ee57823e2e54a2c63f5bbe4538f
Reviewed-on: http://codereview.qt.nokia.com/2571
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoMake session rows half as big in height as pojects rows.
Daniel Molkentin [Tue, 2 Aug 2011 15:04:48 +0000 (17:04 +0200)]
Make session rows half as big in height as pojects rows.

Change-Id: I8c24d4e939d2701c10444bb2c37921a095fe636b
Reviewed-on: http://codereview.qt.nokia.com/2523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQmlDesigner.propertyEditor: preserve alpha value
Thomas Hartmann [Tue, 2 Aug 2011 14:43:27 +0000 (16:43 +0200)]
QmlDesigner.propertyEditor: preserve alpha value

Task-number: QTCREATORBUG-5683
Change-Id: I5101eb4bdb73938628c0f0acc3ebf16868b53cb2
Reviewed-on: http://codereview.qt.nokia.com/2522
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQtQuickApp template: Don't enable qml debugging for every debug build
Kai Koehne [Tue, 2 Aug 2011 10:53:51 +0000 (12:53 +0200)]
QtQuickApp template: Don't enable qml debugging for every debug build

This can be confusing, since there is also the switch in the qmake step,
which is on by default for debug builds too. However, if one disables it
you expect that debugging has in fact been disabled.

Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2
Reviewed-on: http://codereview.qt.nokia.com/2511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoClear minimum Qt version and required features when needed
Jarek Kobus [Tue, 2 Aug 2011 11:39:07 +0000 (13:39 +0200)]
Clear minimum Qt version and required features when needed

When the user chooses back button and select something
different than Symbian or Meego the above fields
should be cleared.

Task-number: QTCREATORBUG-5708
Change-Id: I2a8557cd1ab60dfc309c585399cd5b2210b44cc9
Reviewed-on: http://codereview.qt.nokia.com/2513
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoQmlProfiler: Fix documentation link for setting up debugging
Kai Koehne [Tue, 2 Aug 2011 10:48:48 +0000 (12:48 +0200)]
QmlProfiler: Fix documentation link for setting up debugging

Link directly to the page where the setup is described (qml profiler
page just links to it).

Change-Id: Ibe88f1b2269c90e868aab5272b01e337956d8e46
Reviewed-on: http://codereview.qt.nokia.com/2510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoFix crash when spliting GLSL editor
Leandro Melo [Tue, 2 Aug 2011 10:26:00 +0000 (12:26 +0200)]
Fix crash when spliting GLSL editor

Not a good idea to keep the editor stored since when removing
a split, for example, the editor will go away and the highlighter
is not aware of it anyhow since it actually belongs to the document.

Although it's not necessary for the fix this patch add another
constructor to SyntaxHighlighter which takes the BaseTextDocument.
This is convenient.

Task-number: QTCREATORBUG-5695
Change-Id: Ic91837b7d91ebd3a44c16e2fd589d7f6c5c0c002
Reviewed-on: http://codereview.qt.nokia.com/2508
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoGit: Fix ignore whitespaces/patience
Tobias Hunger [Tue, 2 Aug 2011 10:58:55 +0000 (10:58 +0000)]
Git: Fix ignore whitespaces/patience

Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDesigner.propertyEditor: fix for Image (2)
Thomas Hartmann [Tue, 2 Aug 2011 09:53:38 +0000 (11:53 +0200)]
QmlDesigner.propertyEditor: fix for Image (2)

Task-Number: QTCREATORBUG-5699
Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a
Reviewed-on: http://codereview.qt.nokia.com/2505
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDesigner.propertyEditor: fix for Image
Thomas Hartmann [Tue, 2 Aug 2011 09:52:06 +0000 (11:52 +0200)]
QmlDesigner.propertyEditor: fix for Image

Task-Number: QTCREATORBUG-5700
Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941
Reviewed-on: http://codereview.qt.nokia.com/2504
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDesigner.propertyEditor: fix for border image
Thomas Hartmann [Tue, 2 Aug 2011 09:57:04 +0000 (11:57 +0200)]
QmlDesigner.propertyEditor: fix for border image

SourceSize is read only.

Change-Id: If5fe2e25026098efde942bbc63948fd3e27f6545
Reviewed-on: http://codereview.qt.nokia.com/2506
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDesigner.propertyEditor: crash fix
Thomas Hartmann [Tue, 2 Aug 2011 09:44:29 +0000 (11:44 +0200)]
QmlDesigner.propertyEditor: crash fix

We did not handle the case that a gradient is a binding.

Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14
Reviewed-on: http://codereview.qt.nokia.com/2503
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoUpdate Polish translations
Jarek Kobus [Tue, 2 Aug 2011 09:42:27 +0000 (11:42 +0200)]
Update Polish translations

Change-Id: I949a1c40fe9555857a77066b966be2928c26f1ad
Reviewed-on: http://codereview.qt.nokia.com/2502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
12 years agoQmlDesigner.NodeInstances: Show binding in text if invalid
Marco Bubke [Mon, 1 Aug 2011 18:39:55 +0000 (20:39 +0200)]
QmlDesigner.NodeInstances: Show binding in text if invalid

If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlProfiler: Fix warning about unused variable
Kai Koehne [Mon, 1 Aug 2011 14:56:31 +0000 (16:56 +0200)]
QmlProfiler: Fix warning about unused variable

Change-Id: I274b844215eeebb33e81bd7df6b07862286fcefe
Reviewed-on: http://codereview.qt.nokia.com/2446
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agofilemanager: fix regression when trying to save read-only file
Fawzi Mohamed [Mon, 1 Aug 2011 12:58:33 +0000 (14:58 +0200)]
filemanager: fix regression when trying to save read-only file

When saving a read-only file, a dialog should appear with
Make Writable / Save As / Cancel should open.
Avoids relying on permission error to detect read-only files as
qfsfileengine_unix.cpp treats errno == EACCESS as a QFile::OpenError.

Change-Id: Icdffdc4617c8ef2b58d58aeedbb2b454d0da9465
Task-Number: QTCREATORBUG-5066
Reviewed-on: http://codereview.qt.nokia.com/2442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoQmlDesigner.rewriter: string fix
Thomas Hartmann [Mon, 1 Aug 2011 13:06:50 +0000 (15:06 +0200)]
QmlDesigner.rewriter: string fix

Change-Id: I9a46704c24bdd9ddfd24ba2cf76eb2573f1cf5ef
Reviewed-on: http://codereview.qt.nokia.com/2441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoAvoid multiple context menus popping up.
Eike Ziller [Mon, 1 Aug 2011 10:20:08 +0000 (12:20 +0200)]
Avoid multiple context menus popping up.

On Mac in debug mode, right-clicking on extra text area would first open
the markers menu, and after that the menu where you select which debug
widgets to show (like Stack or Locals and Expressions).
Opening the markers menu in a context menu event on the extra area is
both the more sensible thing to do, and works around the Mac
inconsistency.

Task-number: QTCREATORBUG-4699
Change-Id: I38efaffac80a98773deeeada3d0e3ef4f872c03b
Reviewed-on: http://codereview.qt.nokia.com/2434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoDebugger[gdb]: Fix crash when stepping over QLocale initialization.
Friedemann Kleint [Fri, 22 Jul 2011 15:06:18 +0000 (17:06 +0200)]
Debugger[gdb]: Fix crash when stepping over QLocale initialization.

Check the index before the array is accessed in the call item.

Task-number: QTCREATORBUG-5576
Change-Id: I3f533ef76af42dad97c93087f2d434b58fdedd44
Reviewed-on: http://codereview.qt.nokia.com/2044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoMake sensible use of global analyzer settings
Eike Ziller [Mon, 25 Jul 2011 18:16:29 +0000 (20:16 +0200)]
Make sensible use of global analyzer settings

Project settings now have the option to use the global settings (on by
default), or custom ones.

Task-number: QTCREATORBUG-5445

Change-Id: I6602b53a6e7823150773e8461ef9db39b7546e98
Reviewed-on: http://codereview.qt.nokia.com/2163
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoRemove superflous connect statement.
Daniel Molkentin [Mon, 1 Aug 2011 10:27:33 +0000 (12:27 +0200)]
Remove superflous connect statement.

Change-Id: I964e3765c4b499e291539d9031d66c8f35642abe
Reviewed-on: http://codereview.qt.nokia.com/2437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoRemove warning about missing file.
Eike Ziller [Mon, 1 Aug 2011 06:54:29 +0000 (08:54 +0200)]
Remove warning about missing file.

The file is created only at qmake run.

Change-Id: Ie3e07ee6e66aeb660a8bf9960e4ff198851c19a8
Reviewed-on: http://codereview.qt.nokia.com/2433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoL10n: German translation for 2.3.
Friedemann Kleint [Mon, 1 Aug 2011 06:55:08 +0000 (08:55 +0200)]
L10n: German translation for 2.3.

Change-Id: I2a0ee7db27dba27d74a1d6a10a7e4ca7cb2d1282
Reviewed-on: http://codereview.qt.nokia.com/2428
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agotr()-Fix: 'Report bug' needs '...'
Friedemann Kleint [Mon, 1 Aug 2011 06:53:26 +0000 (08:53 +0200)]
tr()-Fix: 'Report bug' needs '...'

Acked-by: Eike Ziller <eike.ziller@nokia.com>
Change-Id: I892df68c1e9eb5f45275c1a441903279ca1ce665
Reviewed-on: http://codereview.qt.nokia.com/2427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoDisable debug output in QtVersionManager::updateFromInstaller()
Daniel Teske [Fri, 29 Jul 2011 15:27:08 +0000 (17:27 +0200)]
Disable debug output in QtVersionManager::updateFromInstaller()

Change-Id: Ifc1f037796a4a59585f34c8b043d0573c88959da
Reviewed-on: http://codereview.qt.nokia.com/2402
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDbg: Don't wait infinitely for messages on application output
Kai Koehne [Thu, 28 Jul 2011 08:38:39 +0000 (10:38 +0200)]
QmlDbg: Don't wait infinitely for messages on application output

We only connect to the port when we get a 'Waiting for connection ...'
message on application output. This was done mainly to avoid lots
of failed connects, and therefore an unresponsive UI on Windows.

However, the application output might be redirected for various reasons.
Therefore fall back to busy connect after a certain time (4 seconds
for profiling, 8 seconds for debugging).

Change-Id: Ie1b943f678ced40c030cc134493a2adf7e3bc9df
Reviewed-on: http://codereview.qt.nokia.com/2323
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoProvide qmlviewer in external tools menu
Kai Koehne [Fri, 29 Jul 2011 12:58:26 +0000 (14:58 +0200)]
Provide qmlviewer in external tools menu

Quite a few people have asked for previewing a .qml file in qmlviewer,
independent of the current project format.

Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5
Reviewed-on: http://codereview.qt.nokia.com/2397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoGCC: Fix parsing of gcc 4.6 output
Tobias Hunger [Fri, 29 Jul 2011 10:33:15 +0000 (10:33 +0000)]
GCC: Fix parsing of gcc 4.6 output

 * Add unit test.
 * Tweak regexp to make the new unit test pass.

Task-number: QTCREATORBUG-5634
Change-Id: I31da8e3ac7fb1c3c5129b4fed6a228d0a73a09ea
Reviewed-on: http://codereview.qt.nokia.com/2395
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQtVersion: Set qmakeIsExecutable to false if qmake crashes.
Friedemann Kleint [Thu, 14 Jul 2011 11:35:40 +0000 (13:35 +0200)]
QtVersion: Set qmakeIsExecutable to false if qmake crashes.

This prevents literally dozens of crash dialog boxes on Windows.
Check for a crash in the helper library and in updateVersionInfo
consistently whatever is called first.
Initialize qmakeIsExecutable in 2nd constructor as well.

Change-Id: Ifafb7b3edfae8826ac062d634a39a2a804446942
Reviewed-on: http://codereview.qt.nokia.com/1661
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDbg: Fix behavior when re-running the same run control
Kai Koehne [Thu, 28 Jul 2011 15:04:35 +0000 (17:04 +0200)]
QmlDbg: Fix behavior when re-running the same run control

Change-Id: Icb405b4751fc885d8b96d1daec3653236b564ef0
Reviewed-on: http://codereview.qt.nokia.com/2352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoGCC: detect compiler setting in C locale
Tobias Hunger [Fri, 29 Jul 2011 08:53:00 +0000 (08:53 +0000)]
GCC: detect compiler setting in C locale

Run detection of GCC compiler settings using the C locale. This
should fix detection of some settings in non english locales.

Task-number: QTCREATORBUG-5637
Change-Id: I3ea74ce5374fb03ea0cd43566ee302c635e02cd4
Reviewed-on: http://codereview.qt.nokia.com/2387
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoShow baseEnvironment changes in QmlProjectRunConfigurations's widget
Daniel Teske [Thu, 28 Jul 2011 16:23:01 +0000 (18:23 +0200)]
Show baseEnvironment changes in QmlProjectRunConfigurations's widget

That react to editing qt versions and selecting a different qt version.
The environment also depends on the available toolchains, that is
not taken into account.

Change-Id: I70fc1d444a0cbceb4fcb35fb7961bac8a0db9c14
Reviewed-on: http://codereview.qt.nokia.com/2353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoNew QTC_CHECK warning replacing QTC_ASSERT(x, /**/)
Kai Koehne [Fri, 29 Jul 2011 10:00:11 +0000 (12:00 +0200)]
New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)

Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoRemoteLinux: Fix key deployment dialog.
Christian Kandeler [Fri, 29 Jul 2011 09:53:39 +0000 (11:53 +0200)]
RemoteLinux: Fix key deployment dialog.

When aborting the file dialog, the deployment dialog would not close
on its own.

Change-Id: I614f199b9fd486593e12b18f7f536561e7edae1d
Reviewed-on: http://codereview.qt.nokia.com/2388
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoDebugger[CDB]: Breakpoint pass (ignore) count needs decimal prefix.
Friedemann Kleint [Fri, 29 Jul 2011 06:56:25 +0000 (08:56 +0200)]
Debugger[CDB]: Breakpoint pass (ignore) count needs decimal prefix.

Task-number: QTCREATORBUG-5654

Change-Id: Ia69c582c342b5e00b5d267320f85efeb49b449f2
Reviewed-on: http://codereview.qt.nokia.com/2379
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoAdd Help Menu Entry that points to the bug tracker.
Daniel Molkentin [Tue, 26 Jul 2011 16:38:27 +0000 (18:38 +0200)]
Add Help Menu Entry that points to the bug tracker.

Task-Number: QTCREATORBUG-5098
Change-Id: Ibed9e8eea98cb716f2eff29582a39e133c7d8607
Reviewed-on: http://codereview.qt.nokia.com/2221
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoDebugger: Fix crash in stack frame layout display.
Friedemann Kleint [Thu, 28 Jul 2011 12:47:49 +0000 (14:47 +0200)]
Debugger: Fix crash in stack frame layout display.

The option is also enabled when the index is invalid.

Task-number: QTCREATORBUG-5650
Change-Id: If1efb900d29724e5c43db1589c797197fae67bd2
Reviewed-on: http://codereview.qt.nokia.com/2342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoOnly show the infobar once
Daniel Teske [Wed, 27 Jul 2011 11:41:30 +0000 (13:41 +0200)]
Only show the infobar once

Change-Id: I274627999649d00efead89222bbdc325e55932b7
Reviewed-on: http://codereview.qt.nokia.com/2281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoQmlDesigner.itemLibrary: adding status bar
Thomas Hartmann [Thu, 28 Jul 2011 10:28:07 +0000 (12:28 +0200)]
QmlDesigner.itemLibrary: adding status bar

Change-Id: Ifbc6aecfaec93a47e16bb2a03eaafb4dc991c139
Reviewed-on: http://codereview.qt.nokia.com/2334
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoWindows: Don't print 'cannot retrieve debugging output' signal multiple times
Kai Koehne [Thu, 28 Jul 2011 09:55:27 +0000 (11:55 +0200)]
Windows: Don't print 'cannot retrieve debugging output' signal multiple times

Disconnect from the WinDebugInterface instance, because every new
run control started will emit the same 'cannotRetrieveDebugOutput()'
signal again.

Change-Id: I94d591e0fa1664f7f7ca0ed4b1d9e021d23cd3e3
Task-number: QTCREATORBUG-5443
Reviewed-on: http://codereview.qt.nokia.com/2327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoDebugger: Only warn once about unhandled breakpoints
Kai Koehne [Thu, 28 Jul 2011 09:16:50 +0000 (11:16 +0200)]
Debugger: Only warn once about unhandled breakpoints

Don't show the dialog for every single breakpoint

Task-number: QTCREATORBUG-5557
Change-Id: Id1b60e92856cd2c8b81de43340bbaf4f5d7f3a8d
Reviewed-on: http://codereview.qt.nokia.com/2326
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoVCS: Do not increase the number of VCSes in ProjectLoadWizard
Tobias Hunger [Wed, 27 Jul 2011 12:36:29 +0000 (12:36 +0000)]
VCS: Do not increase the number of VCSes in ProjectLoadWizard

Do not increase the number of VCSes by readding the same entries when going
back/next on the summary page of the project load wizard.

Task-number: QTCREATORBUG-5519
Change-Id: I60058cf2060fae4e5703e77fe97a727108bbc8c8
Reviewed-on: http://codereview.qt.nokia.com/2283
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
13 years agoQmlProfiler: Fix warnings about hiding overloaded virtual functions
Kai Koehne [Thu, 28 Jul 2011 08:47:53 +0000 (10:47 +0200)]
QmlProfiler: Fix warnings about hiding overloaded virtual functions

toolSelected() & toolDeselected are const methods in the base class.
But anyway the attach Action isn't used any more, so let's remove it
completely ...

Change-Id: Ia40cb6d927fb8422700816a8c6de81aa3734959d
Reviewed-on: http://codereview.qt.nokia.com/2324
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlProfiler: Fix compiler warning
Kai Koehne [Thu, 28 Jul 2011 08:51:51 +0000 (10:51 +0200)]
QmlProfiler: Fix compiler warning

Change-Id: Ice5ddc38e2b47ca067c761dc80716742469dddbd
Reviewed-on: http://codereview.qt.nokia.com/2325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlDesigner.NodeInstances: Add version to puppet
Marco Bubke [Wed, 27 Jul 2011 18:13:39 +0000 (20:13 +0200)]
QmlDesigner.NodeInstances: Add version to puppet

Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.NodeInstances: Add a default dummy context
Marco Bubke [Wed, 27 Jul 2011 15:29:01 +0000 (17:29 +0200)]
QmlDesigner.NodeInstances: Add a default dummy context

Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.NodeInstances: Move context object to a context directory
Marco Bubke [Wed, 27 Jul 2011 13:41:53 +0000 (15:41 +0200)]
QmlDesigner.NodeInstances: Move context object to a context directory

filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.rewriter: ignore Component if is is the root item
Thomas Hartmann [Wed, 27 Jul 2011 15:52:49 +0000 (17:52 +0200)]
QmlDesigner.rewriter:  ignore Component if is is the root item

Task-number: QTCREATORBUG-1828
Change-Id: Iba5d2e93a905c2a3c32730c4342b78ef4adfe8bc
Reviewed-on: http://codereview.qt.nokia.com/2301
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoHelp requests must be done in main thread.
Eike Ziller [Wed, 27 Jul 2011 13:37:56 +0000 (15:37 +0200)]
Help requests must be done in main thread.

Fixes an occassional assert "Cannot send events to objects owned by a
different thread." with receiver QHelpEngineCorePrivate.

Change-Id: I77ffd663a055c493607907374f7a4d775f6aac6c
Reviewed-on: http://codereview.qt.nokia.com/2289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlProfiler: Fix profiling Symbian apps over WLAN
Kai Koehne [Wed, 27 Jul 2011 09:58:17 +0000 (11:58 +0200)]
QmlProfiler: Fix profiling Symbian apps over WLAN

Use IP address from deploy configuration, not localhost

Change-Id: I1a5fcf6dc07a0d98404fdfb3a230c04f4062a57e
Reviewed-on: http://codereview.qt.nokia.com/2268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoDebugger: Prevent message boxes for every output to stderr
Kai Koehne [Wed, 27 Jul 2011 11:32:02 +0000 (13:32 +0200)]
Debugger: Prevent message boxes for every output to stderr

The use of QErrorMessage::qtHandle() installs a message handler
that from then on pops up a warning for each qWarning().

Change-Id: Iad6ac7b002ffc007de7df7a41c3ce0f9ee40e6d0
Reviewed-on: http://codereview.qt.nokia.com/2280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoQmlDesigner.propertyEditor: layout fix
Thomas Hartmann [Wed, 27 Jul 2011 13:24:44 +0000 (15:24 +0200)]
QmlDesigner.propertyEditor: layout fix

Adding an expanding widget to the layout

Task-number: QTCREATORBUG-5567
Change-Id: I6b52804af2bc798559661620605e2f8922a79ff0
Reviewed-on: http://codereview.qt.nokia.com/2286
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.NodeInstance: Update the screen object if the root item size changed
Marco Bubke [Wed, 27 Jul 2011 12:46:12 +0000 (14:46 +0200)]
QmlDesigner.NodeInstance: Update the screen object if the root item size changed

Change-Id: Ifc06131f4a57a30ab9b20687372150b23c8416cb
Reviewed-on: http://codereview.qt.nokia.com/2285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.NodeInstance: Reset items if the aux size is invalid
Marco Bubke [Wed, 27 Jul 2011 12:45:05 +0000 (14:45 +0200)]
QmlDesigner.NodeInstance: Reset items if the aux size is invalid

Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.FormEditor: Skip all move events between a 30 ms time frame
Marco Bubke [Tue, 26 Jul 2011 17:34:56 +0000 (19:34 +0200)]
QmlDesigner.FormEditor: Skip all move events between a 30 ms time frame

To many move events will stall the local sockets.

Change-Id: Iec9a072a6c2e217d19c656d5596c40167ca97675
Reviewed-on: http://codereview.qt.nokia.com/2222
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlJSDebugger: Fix crash when stopping debugger
Kai Koehne [Wed, 27 Jul 2011 10:30:34 +0000 (12:30 +0200)]
QmlJSDebugger: Fix crash when stopping debugger

The destructor of QmlAdapter deletes the QDeclarativeDebugConnection,
which in turn results in status changes to the QmLJSInspectorClient. This
again leads to QmlAdapter::logServiceStatusChange() being called for the
already half-destructed object ... break this change by guarding the pointer
to QmlAdapter in QmlJSClientProxy.

Change-Id: I7ae3d45b2146b4f02e3843375ecf276ae75d5ea0
Task-number: QTCREATORBUG-5500
Reviewed-on: http://codereview.qt.nokia.com/2276
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlDesigner.itemLibrary: use QFileSystemModel
Thomas Hartmann [Wed, 27 Jul 2011 11:32:10 +0000 (13:32 +0200)]
QmlDesigner.itemLibrary: use QFileSystemModel

QDirModel is depricated.
Task-number: QTCREATORBUG-3134

Change-Id: I21faf0c48a0126db6545893e8f3a86aa5180fffd
Reviewed-on: http://codereview.qt.nokia.com/2279
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoFix crash on editing qmake path
Daniel Teske [Wed, 27 Jul 2011 10:16:18 +0000 (12:16 +0200)]
Fix crash on editing qmake path

Invalid qmake's would lead to crashes

Task-Nr: QTCREATORBUG-5544

Change-Id: Iba3d4004a7d242f0ff5e56556befa82b58e68bbb
Reviewed-on: http://codereview.qt.nokia.com/2277
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQmlCppDebugging: handling Harmattan mixed debugging
Christiaan Janssen [Wed, 27 Jul 2011 10:24:16 +0000 (12:24 +0200)]
QmlCppDebugging: handling Harmattan mixed debugging

Change-Id: Idfc0a6d48bcc1c42aac58ea03b5a51ad6e661f25
Reviewed-on: http://codereview.qt.nokia.com/2275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlJsDbg: Fix compilation for Symbian
Kai Koehne [Tue, 26 Jul 2011 06:51:26 +0000 (08:51 +0200)]
QmlJsDbg: Fix compilation for Symbian

Despite of '-k' passed to make, the 'all' target might still fail prematurely
because make doesn't forward the '-k' to sbs. Anyway, now that we
know the exact toolchain we can do better and only compile the
targets that fit to the toolchain.

If not Symbian, use the 'all' target everywhere, which ensures
we're both compiling debug and release versions of all helpers.

Change-Id: I0c3b699724472c8c2035d2c20bc451b47a301d1d
Reviewed-on: http://codereview.qt.nokia.com/2159
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoQMlProfiler: Print logging / errors while connecting to General Messages pane
Kai Koehne [Wed, 27 Jul 2011 09:49:39 +0000 (11:49 +0200)]
QMlProfiler: Print logging / errors while connecting to General Messages pane

Actually the error message should ideally show up in Application Output, but
that would require a translation. Left for 2.4.

Change-Id: Ia13dc46bf82f28862ac38e830b241f4b23f83fa2
Reviewed-on: http://codereview.qt.nokia.com/2267
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQtQuickToolBar: fix positioning
Thomas Hartmann [Wed, 27 Jul 2011 09:51:51 +0000 (11:51 +0200)]
QtQuickToolBar: fix positioning

Instead of hiding the widget we move it accordingly.

Task-number: QTCREATORBUG-2958
Change-Id: I45deafab33ea928d4c4d6ff199ec542c1ee6ef3e
Reviewed-on: http://codereview.qt.nokia.com/2266
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.quickToolBar: fix for Image
Thomas Hartmann [Wed, 27 Jul 2011 09:39:03 +0000 (11:39 +0200)]
QmlDesigner.quickToolBar: fix for Image

If no source is defined we set an empty source.
Before we took the source from the last image object which was
confusing.

Task-number: QTCREATORBUG-2714
Change-Id: If9535ffa4dc7abe0767d8aee5629c46de4df9825
Reviewed-on: http://codereview.qt.nokia.com/2265
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlJSEditor: only show context menu for Quick Toolbar if available
Thomas Hartmann [Wed, 27 Jul 2011 09:22:10 +0000 (11:22 +0200)]
QmlJSEditor: only show context menu for Quick Toolbar if available

Task-number: QTCREATORBUG-4521
Change-Id: Iedd97549c6f724b58a0727694ea1b34a2c70d9e9
Reviewed-on: http://codereview.qt.nokia.com/2264
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQMlProfiler: Fix regression when running on Symbian device
Kai Koehne [Tue, 26 Jul 2011 13:34:41 +0000 (15:34 +0200)]
QMlProfiler: Fix regression when running on Symbian device

Use MODE_ANALYZER here, which let CodaRunControl add
the '-qmljsdebugger=..' command line argument. Got broken by
36a3028b9d3535.

Change-Id: Ic17e1d1a5f379aaa0c6c7bac0ea0b273e58d9215
Reviewed-on: http://codereview.qt.nokia.com/2201
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlJSDebugger: Allow debugging over CODA/WLAN
Kai Koehne [Tue, 26 Jul 2011 12:47:31 +0000 (14:47 +0200)]
QmlJSDebugger: Allow debugging over CODA/WLAN

Fix the RunControl so that it uses the right address & port for
connecting to the running app.

Task-number: QTCREATORBUG-5607
Change-Id: Ia8c76740fe6c7d67f8c5bcaac6416a08dcb7774d
Reviewed-on: http://codereview.qt.nokia.com/2199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoQtOptionsPage: Store selected toolchain for debugging helpers
Kai Koehne [Tue, 26 Jul 2011 10:33:53 +0000 (12:33 +0200)]
QtOptionsPage: Store selected toolchain for debugging helpers

Keep selected toolchain when switching between Qt versions.

Change-Id: I801e507d11b36b01888f016c35196fb098473bbf
Reviewed-on: http://codereview.qt.nokia.com/2183
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQtOptionsPage: Disable toolchain combo box while building
Kai Koehne [Tue, 26 Jul 2011 09:57:28 +0000 (11:57 +0200)]
QtOptionsPage: Disable toolchain combo box while building

Change-Id: I4e254bb1b88410161058b3a72d55bd711be36feb
Reviewed-on: http://codereview.qt.nokia.com/2182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoDebuggingHelpers: Update after built for newly added versions
Kai Koehne [Tue, 26 Jul 2011 08:45:45 +0000 (10:45 +0200)]
DebuggingHelpers: Update after built for newly added versions

One can already build debugging helpers for Qt Versions not yet
registered to QtVersionManager - which resulted in a QTC_ASSERT
+ the changes after the built were not picked up.

Change-Id: I12a769df6e18a05b0d1677fd913f4064efed3429
Reviewed-on: http://codereview.qt.nokia.com/2168
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDesigner.designDocumentController: fix for copy n paste
Thomas Hartmann [Tue, 26 Jul 2011 16:03:16 +0000 (18:03 +0200)]
QmlDesigner.designDocumentController: fix for copy n paste

We have to clear the cache of the meta system.

Task-number:QTCREATORBUG-5578
Change-Id: I6f7a77609fb5535ade5925a405ae156edfee2b22
Reviewed-on: http://codereview.qt.nokia.com/2215
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoFixed German translation
Robert Loehning [Tue, 26 Jul 2011 15:19:02 +0000 (17:19 +0200)]
Fixed German translation

Change-Id: I6ba537b28c8cdcf8dfdc3f194682170829605caa
Reviewed-on: http://codereview.qt.nokia.com/2214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoGit: Fix thinko when trying to find merged branches
Tobias Hunger [Tue, 26 Jul 2011 13:13:04 +0000 (13:13 +0000)]
Git: Fix thinko when trying to find merged branches

Fix thinko when trying to find out whether a branch was merged or not.

Change-Id: I6c4d600508af8a68fe0bac7e61f0b912c43cec32
Reviewed-on: http://codereview.qt.nokia.com/2200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
13 years agoWork around wrong click area of output buttons on Mac.
Eike Ziller [Tue, 26 Jul 2011 12:32:34 +0000 (14:32 +0200)]
Work around wrong click area of output buttons on Mac.

For some reason using push buttons in the status bar will make
the clickable area of the buttons too small (half of the button isn't
clickable). Using QToolButtons instead.

Task-number: QTCREATORBUG-4513
Change-Id: I8b0f97552ec9b2471d570d577522b7ce5f382fb9
Reviewed-on: http://codereview.qt.nokia.com/2193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
13 years agoFix graphic glitches in project mode
Tobias Hunger [Mon, 25 Jul 2011 15:59:53 +0000 (15:59 +0000)]
Fix graphic glitches in project mode

Fix rendering issues in the build step lists display of the project
mode: The label got dropped from the layout.

Never drop the widgets from the layout to avoid this issue:-)

Change-Id: I912a8b6d78537f0c395c2bc440387b20b66a4584
Reviewed-on: http://codereview.qt.nokia.com/2126
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoGit: Fix addition of tracking branches
Tobias Hunger [Tue, 26 Jul 2011 12:33:16 +0000 (12:33 +0000)]
Git: Fix addition of tracking branches

The dialog is always hidden by the time the tracking state is queried,
so all new branches were done in non-tracking mode.

Change-Id: I11cdbec6af1c756c1449d68a2efeb31a1c5bd0ec
Reviewed-on: http://codereview.qt.nokia.com/2196
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoGit: Fix assert
Tobias Hunger [Tue, 26 Jul 2011 12:32:13 +0000 (12:32 +0000)]
Git: Fix assert

Refresh button states after running a checkout: The operation changes
the currently active branch and thus needs to disable e.g. the remove
action.

Change-Id: Id060ec63dbcf3c3132a832c2801073df5f9e91f1
Reviewed-on: http://codereview.qt.nokia.com/2195
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoPreserve original line ending in find->replace
Leandro Melo [Mon, 25 Jul 2011 09:56:16 +0000 (11:56 +0200)]
Preserve original line ending in find->replace

Task-number: QTCREATORBUG-5581
Change-Id: Id1aae0d27d474ca051696032ab3b36e7783b766f
Reviewed-on: http://codereview.qt.nokia.com/2102
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoQmlProfiler: variable width of status display
Christiaan Janssen [Tue, 26 Jul 2011 12:02:27 +0000 (14:02 +0200)]
QmlProfiler: variable width of status display

Task-number: QTCREATORBUG-5610
Change-Id: Iffb94213fb209799f2ba55c1031c091c68ece4ea
Reviewed-on: http://codereview.qt.nokia.com/2190
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoGCC: Parse "In file included from blah:x:y:"
Tobias Hunger [Tue, 26 Jul 2011 11:05:59 +0000 (11:05 +0000)]
GCC: Parse "In file included from blah:x:y:"

Parse "In file included from blah:x:y:" correctly: Newer Gccs output
additional column information there.

Change-Id: I5fe2be72ce09390c0f1370fd9b72c900279d3207
Reviewed-on: http://codereview.qt.nokia.com/2188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoFix crash when replying macro including alt+r
Eike Ziller [Tue, 26 Jul 2011 11:42:34 +0000 (13:42 +0200)]
Fix crash when replying macro including alt+r

Task-number: QTCREATORBUG-5331

Change-Id: Ice1b9d0bdd153e437e5a70b208947b6db98cc1e3
Reviewed-on: http://codereview.qt.nokia.com/2189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoQmlDebugging: Enable help link for S60RunConfig
Kai Koehne [Tue, 26 Jul 2011 11:10:55 +0000 (13:10 +0200)]
QmlDebugging: Enable help link for S60RunConfig

Task-number: QTCREATORBUG-5609
Change-Id: I5e4d96b2cbd7c0bd70750010aee5c703c7b29f64
Reviewed-on: http://codereview.qt.nokia.com/2186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoCrash: Fix crash when importing broken Qt versions
Tobias Hunger [Tue, 26 Jul 2011 10:15:28 +0000 (10:15 +0000)]
Crash: Fix crash when importing broken Qt versions

Fix a crash when importing a build, using a qmake that is broken.

I ran into this crash with a 32bit qmake used in a pure 64bit userland.

Change-Id: I08acb8d5f2cd72c873a30be5e45324f6daef702c
Reviewed-on: http://codereview.qt.nokia.com/2181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoFix Windows resource file qtcreator.rc.
Friedemann Kleint [Tue, 26 Jul 2011 09:53:35 +0000 (11:53 +0200)]
Fix Windows resource file qtcreator.rc.

Use \\.

Change-Id: I63822a79cb6593111b39996c39d774434e291893
Reviewed-on: http://codereview.qt.nokia.com/2175
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDesigner.navigator: keep position while reparenting
Thomas Hartmann [Tue, 26 Jul 2011 09:22:52 +0000 (11:22 +0200)]
QmlDesigner.navigator: keep position while reparenting

Task-number: QTCREATORBUG-3252
Change-Id: I03f335b1bc9943251dffba016ccf1d9b7b1e081e
Reviewed-on: http://codereview.qt.nokia.com/2170
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoAdded missing tr()s
Robert Loehning [Mon, 25 Jul 2011 18:52:07 +0000 (20:52 +0200)]
Added missing tr()s

Change-Id: Ic4b558956764a141e470c24613c0572beeee4615
Reviewed-on: http://codereview.qt.nokia.com/2128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoFix layout in project mode
Tobias Hunger [Mon, 25 Jul 2011 15:16:28 +0000 (15:16 +0000)]
Fix layout in project mode

Fix broken layout in project mode:
 * Code style settings were indented too much
 * Editor settings were indented too much

Change-Id: Id56f45566a87807588ac265db76a718d936dc4a5
Reviewed-on: http://codereview.qt.nokia.com/2125
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoQmlProfiler: correctly displaying status when recording disabled
Christiaan Janssen [Mon, 25 Jul 2011 14:16:09 +0000 (16:16 +0200)]
QmlProfiler: correctly displaying status when recording disabled

Each time a new profiling session is started, the root component
is reloaded.  If Plotter.ranges contains data, which might be
the case when not recording, the count in the root item should
not be reset to 0, and the dataAvailable flag stay to true.

Change-Id: I2a34e30a4ae7179d3675b62792dcae7b9eba0462
Reviewed-on: http://codereview.qt.nokia.com/2118
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlJSLib: Fix linker errors with gcce
Kai Koehne [Mon, 25 Jul 2011 12:59:41 +0000 (14:59 +0200)]
QmlJSLib: Fix linker errors with gcce

usrt2_2.lib is passed to g++ before QmlJSDebugger.lib, which results
in errors about __aeabi_atexit, __dso_handle being undefined. Work around
this by explicitly adding usrt2_2.lib again after QmlJSDebugger.lib.

Task-number: QTCREATORBUG-5556
Change-Id: Id9e1dc19a2ee54e59d92470a35ccfd4946b07dcc
Reviewed-on: http://codereview.qt.nokia.com/2115
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoQmlProfiler: managing failed starts gracefully
Christiaan Janssen [Mon, 25 Jul 2011 12:49:07 +0000 (14:49 +0200)]
QmlProfiler: managing failed starts gracefully

Change-Id: Ice0debcb6b83977b8f50dd154687e7c5c6abac7b
Reviewed-on: http://codereview.qt.nokia.com/2113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoMaemo: Fix order of command line options for sysroot installations.
Christian Kandeler [Mon, 25 Jul 2011 14:03:38 +0000 (16:03 +0200)]
Maemo: Fix order of command line options for sysroot installations.

Change-Id: Ib7b30a391afceec4262a396b3eca7893a6076ab8
Reviewed-on: http://codereview.qt.nokia.com/2117
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoUpdated Russian translation
Sergey Belyashov [Mon, 25 Jul 2011 14:14:10 +0000 (16:14 +0200)]
Updated Russian translation

Merge-request: 356
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Id1c812158def28788b4d4b73bff66d231d7a1e20

13 years agoQmlProfiler: supporting Application Output Pane buttons
Christiaan Janssen [Mon, 25 Jul 2011 08:36:21 +0000 (10:36 +0200)]
QmlProfiler: supporting Application Output Pane buttons

Task-Numbers: QTCREATORBUG-5548 5549 5550 5551 5552

Change-Id: I39a18e05967cf50eab2725cb65e6291d66c8af55
Reviewed-on: http://codereview.qt.nokia.com/2112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlDbgHelper: Fix compilation for Symbian target in SDK
Kai Koehne [Thu, 21 Jul 2011 14:44:47 +0000 (16:44 +0200)]
QmlDbgHelper: Fix compilation for Symbian target in SDK

The Symbian3Qt473 folder in the SDK contains a .qmake.cache
with invalid QMAKE_MOC path. Override this in the .pro file.
Also make sure that the .prl file is generated (create_prl was
set in the .qmake.cache)

Change-Id: Ibf905b4d9a8addf1b45a2ee40acdd0134da30e11
Reviewed-on: http://codereview.qt.nokia.com/1977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoDebugger[CDB]: Fix breakpoint location correction in constructors.
Friedemann Kleint [Mon, 25 Jul 2011 13:01:19 +0000 (15:01 +0200)]
Debugger[CDB]: Fix breakpoint location correction in constructors.

Change-Id: I638554936eae2db7ff2f55508d13f1c52c07f17d
Reviewed-on: http://codereview.qt.nokia.com/2114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
13 years agoQmlDesigner.rewriter: bugfix
Thomas Hartmann [Mon, 25 Jul 2011 12:40:11 +0000 (14:40 +0200)]
QmlDesigner.rewriter: bugfix

Reading the documentation helps.
We want 3 digits after the decimal point ('f')
not 3 significant digits ('g').

Task-number: QTCREATORBUG-5503
Change-Id: I90c16627904b81ea49d3d53d02e4d96787d0b73b
Reviewed-on: http://codereview.qt.nokia.com/2111
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoDebugger[CDB]: Re-enable grab widget.
Friedemann Kleint [Mon, 25 Jul 2011 11:49:18 +0000 (13:49 +0200)]
Debugger[CDB]: Re-enable grab widget.

Broken by 7100d29f.

Change-Id: I7c7b8e071cd3713549316be35a8f9611f46c1212
Reviewed-on: http://codereview.qt.nokia.com/2107
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlDesigner.propertyEditor: fix for undo/redo
Thomas Hartmann [Mon, 25 Jul 2011 11:02:15 +0000 (13:02 +0200)]
QmlDesigner.propertyEditor: fix for undo/redo

Reseting property editor undo/redo to simplify inner state
of the property editor.

Task-number: QTCREATORBUG-4672
Change-Id: I5446567e00068a0de1853c0c4271188135df330e
Reviewed-on: http://codereview.qt.nokia.com/2104
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoGeneric Project: Propagate toolchain changes
Tobias Hunger [Tue, 12 Jul 2011 12:58:16 +0000 (12:58 +0000)]
Generic Project: Propagate toolchain changes

Change-Id: I629101990fb041aa421803dc5485e59acc8a7dd2
Reviewed-on: http://codereview.qt.nokia.com/1525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>