OSDN Git Service
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
Thomas Hartmann [Mon, 25 Jul 2011 08:35:50 +0000 (10:35 +0200)]
QmlDesigner.contextMenu: disable reset if properties are not defined
Reset Size is now disabled if the item(s) has no property "width" and "height".
The same for Reset Position and "x" and "y".
I added const QList<ModelNode> &selectedModelNodes = m_view->selectedModelNodes();
to clean up the code.
Task-number: QTCREATORBUG-5573
Change-Id: I7383e28a7b304bcfa27a5687e84d9f489dfc8a02
Reviewed-on: http://codereview.qt.nokia.com/2094
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Molkentin [Fri, 22 Jul 2011 14:45:41 +0000 (16:45 +0200)]
WelcomeScreen: Clean up tag browser
- Always show tag browser button
- Make tag browser button a toggle (popup semantics)
- Remove "Clear" Button
Change-Id: Ic1f6894103fdc14973c230764ffb06574dd1897b
Reviewed-on: http://codereview.qt.nokia.com/2048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Daniel Molkentin [Fri, 22 Jul 2011 12:29:14 +0000 (14:29 +0200)]
WelcomeScreen: Implementing proper search lexer/parser for the lineedit.
Now copes with quotes and "tag:" prefixes.
Change-Id: I348e533ab290242fd05a034a2912cc95f0a9a3da
Done-with: Roberto Raggi
Reviewed-on: http://codereview.qt.nokia.com/2038
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Tommi Asp [Wed, 20 Jul 2011 10:16:52 +0000 (13:16 +0300)]
RemoteLinux: Temporary changes for RDADeployment plugin.
Export some classes.
Change-Id: Ib959273f4204854b7ce4834afaf84c8222efa9aa
Reviewed-on: http://codereview.qt.nokia.com/2047
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Friedemann Kleint [Fri, 22 Jul 2011 15:17:43 +0000 (17:17 +0200)]
L10n: German translation for 2.3.
Change-Id: Ifef3c7042bafbcdf03d1c434d1bf971aa57ceba5
Reviewed-on: http://codereview.qt.nokia.com/2046
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christiaan Janssen [Fri, 22 Jul 2011 13:52:59 +0000 (15:52 +0200)]
QmlProfiler: refactored warning messagebox
Change-Id: I41e361fc2dc1cab0f103eccbb15b9c38cc78cb77
Reviewed-on: http://codereview.qt.nokia.com/2041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Daniel Molkentin [Thu, 21 Jul 2011 15:21:12 +0000 (17:21 +0200)]
WelcomeScreen: fix Regression
Dropping files on the welcome screen would not open them.
Change-Id: I8ea6b4a55abdec47e40fdeb02d97f45d22db2fb1
Reviewed-on: http://codereview.qt.nokia.com/1992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Daniel Molkentin [Thu, 21 Jul 2011 10:03:39 +0000 (12:03 +0200)]
Git: Ignore more generated files
Change-Id: Ic640fcf4f266de92077c733727f5bc8aa08625e2
Reviewed-on: http://codereview.qt.nokia.com/1939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Christiaan Janssen [Fri, 22 Jul 2011 13:26:40 +0000 (15:26 +0200)]
QmlProfiler: show warning when no executable given
Task-number: QTCREATORBUG-5266
Change-Id: If1639e322f4ab0d7065e3394129c6649f17e98c9
Reviewed-on: http://codereview.qt.nokia.com/2039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
con [Fri, 22 Jul 2011 09:15:46 +0000 (11:15 +0200)]
Wrap "Click here for more" label.
In case other languages show longer text.
Change-Id: Ied7ddc40d43f8c5c473345ee30d2ca63662a25e6
Reviewed-on: http://codereview.qt.nokia.com/2025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Leena Miettinen [Fri, 22 Jul 2011 12:17:28 +0000 (14:17 +0200)]
Doc: fix the Battery Status example code
Add example source files to the repository and use snippets in the doc.
Change-Id: I7ce13c2d5d0994a92d1b001e19af28aec8049e8e
Reviewed-on: http://codereview.qt.nokia.com/2030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Thomas Hartmann [Fri, 22 Jul 2011 11:40:16 +0000 (13:40 +0200)]
QmlDesigner.propertyEditor: fixing restoring values for anchors
Restoring values properly after removing anchors.
Some code cleanup.
Task-number: QTCREATORBUG-4837
Task-number: QTCREATORBUG-5303
Change-Id: Ibb3223b696b6ac0298d746223f5a6e90562f3db0
Reviewed-on: http://codereview.qt.nokia.com/2034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Fri, 22 Jul 2011 11:04:09 +0000 (13:04 +0200)]
QmlDesigner.propertyEditor: reduce delay
Since we changed the slection behaivour after drag and drop
this makes the designer more responsive.
Change-Id: I21c14a126ff0b63151002ac51e841a624b43e879
Reviewed-on: http://codereview.qt.nokia.com/2033
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Fri, 22 Jul 2011 10:55:51 +0000 (12:55 +0200)]
QmlDesigner.rewriter: fixing compare function
Comparing doubles is hard.
I forgot to round properly.
I also added some early rejects.
Task-number: QTCREATORBUG-5503
Change-Id: I959abbe28a312aea63a170d9c769b5555ac6a30e
Reviewed-on: http://codereview.qt.nokia.com/2032
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Thu, 21 Jul 2011 14:46:10 +0000 (16:46 +0200)]
DebuggingHelper: Use right toolchain
Don't just use an arbitrary toolchain, which might break esp. for Symbian.
Instead, retrieve the toolchain from the project, or in the case of the Qt Options
page let the user choose.
Change-Id: I6d271c485420e609d223d8cece754ef84e573745
Reviewed-on: http://codereview.qt.nokia.com/1978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Fri, 22 Jul 2011 09:53:56 +0000 (11:53 +0200)]
Harmattan: Use "single-instance" in default desktop file.
Change-Id: I30b6fe90ea37cc28f93710efcb4233028ca0f90d
Reviewed-on: http://codereview.qt.nokia.com/2029
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Thomas Hartmann [Fri, 22 Jul 2011 09:43:23 +0000 (11:43 +0200)]
QmlDesigner.rewriter: fix for linebreaks
fixing escape() and descape()
Task-number: QTCREATORBUG-5528
Change-Id: Ia51aee21875c912685d38b61fcda6c048ca1e246
Reviewed-on: http://codereview.qt.nokia.com/2027
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Fri, 22 Jul 2011 09:48:42 +0000 (11:48 +0200)]
QmlDesigner.propertyEditor: support for line breaks in text edit
Also fixing a crash regarding translation.
Task-number: QTCREATORBUG-5528
Task-number: QTCREATORBUG-5527
Change-Id: I478d72c3fc5e79919011ff709fcf363054fbca4e
Reviewed-on: http://codereview.qt.nokia.com/2028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Teske [Wed, 20 Jul 2011 11:47:04 +0000 (13:47 +0200)]
Clean up before building debugging helpers
Task-number: QTCREATORBUG-5532
Change-Id: Ic00b486c8bad9b7f4abc61cbd55893b236c4c8cc
Reviewed-on: http://codereview.qt.nokia.com/1880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kandeler [Thu, 21 Jul 2011 13:35:07 +0000 (15:35 +0200)]
WelcomeScreen: Fix compilation with namespaced Qt.
Change-Id: Ia5695feaebba959f84ab4d2707a2d5f1667ad3c7
Reviewed-on: http://codereview.qt.nokia.com/1960
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Thu, 21 Jul 2011 12:49:16 +0000 (14:49 +0200)]
FileUtils: Add some safety checks to removeRecursively().
Change-Id: I657f8416081ce7d253f4a3ef9722a39ac34b5f24
Reviewed-on: http://codereview.qt.nokia.com/1955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Thu, 21 Jul 2011 15:09:37 +0000 (17:09 +0200)]
Doc: using Qt Quick Components for Symbian with Qt Mobility
Change-Id: Ie143e560f67cb99b7b4a70736071eefd57a2e381
Reviewed-on: http://codereview.qt.nokia.com/1954
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Friedemann Kleint [Thu, 21 Jul 2011 14:51:05 +0000 (16:51 +0200)]
QMLProject: Use cancel button.
Change-Id: I2c9b3d3fb6b48428a0b8b9c46c5c994eb8941e13
Reviewed-on: http://codereview.qt.nokia.com/1979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Marco Bubke [Thu, 21 Jul 2011 16:39:50 +0000 (18:39 +0200)]
QmlDesigner.NodeInstances: Reparent after value setting
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christiaan Janssen [Thu, 21 Jul 2011 12:47:45 +0000 (14:47 +0200)]
QmlProfiler: semitransparent gap in zoom indicator
Change-Id: I0dcb7dabdb2f276d509a8c4eb09e02f8af56cbed
Reviewed-on: http://codereview.qt.nokia.com/1953
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Marco Bubke [Thu, 21 Jul 2011 11:26:39 +0000 (13:26 +0200)]
QmlDesigner: Fix qreal is not double
Task-number: QTCREATORBUG-5547
Change-Id: Id23737f292de00232deac792d3db2bd36bda0efe
Reviewed-on: http://codereview.qt.nokia.com/1947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 21 Jul 2011 14:07:09 +0000 (16:07 +0200)]
QmlDesiger.propertyEditor: fix for opacity
Task-number: QTCREATORBUG-5517
Change-Id: I76ce708a4bcad0afe4716877d4c826d1a1a74537
Reviewed-on: http://codereview.qt.nokia.com/1963
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 21 Jul 2011 13:40:56 +0000 (15:40 +0200)]
QmlDesigner.documentController: fix for subcomponents
The change to master model has to be before extractText().
Change-Id: I7e791098ddec8cbc8bd597e4ef4fdb97ef01a6e4
Reviewed-on: http://codereview.qt.nokia.com/1961
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Thu, 21 Jul 2011 08:41:48 +0000 (10:41 +0200)]
MobileAppWizards: Use correct line endings on Windows
Make sure the generated .cpp, .pro files use CRLF on Windows.
Task-number QTCREATORBUG-5124
Change-Id: I3b47a347f1da62f3c654a91720ccc23024b774be
Reviewed-on: http://codereview.qt.nokia.com/1931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Kai Koehne [Thu, 21 Jul 2011 13:32:20 +0000 (15:32 +0200)]
FileInProjectFinder: Fix compilation with 4.7.4
Don't depend on QUrl::isLocalFile, which only exists in 4.8.
Change-Id: I67a8e35c8754396424c5578216bc6deb02ae0d50
Reviewed-on: http://codereview.qt.nokia.com/1959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Kai Koehne [Thu, 21 Jul 2011 10:36:40 +0000 (12:36 +0200)]
DebuggingHelper: Log the toolchain that is used to debugging output
Change-Id: Ia78c2b1cad4135cf3325eb612ccc81d6c3c4fc67
Reviewed-on: http://codereview.qt.nokia.com/1945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christiaan Janssen [Thu, 21 Jul 2011 11:25:34 +0000 (13:25 +0200)]
QmlProfiler: rendering event information popup next to cursor
Task-number: QTCREATORBUG-5538
Change-Id: I6cb4ac6924eda2588657dbea0d51166ad0c01340
Reviewed-on: http://codereview.qt.nokia.com/1948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Wed, 20 Jul 2011 13:36:44 +0000 (15:36 +0200)]
QmlDebugging: Force build for all Symbian targets
Don't stop if e.g. the build for the very first target winscw fails.
Change-Id: I9a8e06045340f2921018bcbe8d2587d848f9aa3f
Reviewed-on: http://codereview.qt.nokia.com/1944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Christiaan Janssen [Thu, 21 Jul 2011 10:31:28 +0000 (12:31 +0200)]
Analyzer: show correct displayName when StartParameters not used
Change-Id: I8c1dd66bca57e043fabed3d9d7726a58513cbcf9
Reviewed-on: http://codereview.qt.nokia.com/1942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Thomas Hartmann [Thu, 21 Jul 2011 11:27:41 +0000 (13:27 +0200)]
QmlDesigner.propertyEditor: fix ui for borders and colors
Hiding controls was a bad idea. It is better to disable them and give
them sensible tooltips.
Task-number: QTCREATORBUG-4667
Task-number: QTCREATORBUG-5433
Change-Id: I2361fbbd3c28a5b9c07787abedf0439d6a7d1ad1
Reviewed-on: http://codereview.qt.nokia.com/1946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 21 Jul 2011 10:30:49 +0000 (12:30 +0200)]
QmlDesigner.propertyEditor: layout fix
Task-number: QTCREATORBUG-5522
Change-Id: I932a40e459ef1160fc362185b22e7dcd0db3237d
Reviewed-on: http://codereview.qt.nokia.com/1940
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Tue, 19 Jul 2011 15:48:57 +0000 (17:48 +0200)]
Qml Tooling: Fix debugging & profiling of .qml files loaded from resources
Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.
Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Eike Ziller [Thu, 21 Jul 2011 09:06:00 +0000 (11:06 +0200)]
Attach tags to bottom of description.
Change-Id: Idbd219ec17ba36c14565c08be4c7cd2e1246f1b1
Reviewed-on: http://codereview.qt.nokia.com/1933
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>