OSDN Git Service
Leena Miettinen [Thu, 6 Oct 2011 09:44:15 +0000 (11:44 +0200)]
Doc: plain C or C++ project wizards
Add more info about other project wizards
Change-Id: I5b143fb1d8203b0a068e07952952f812b2a601df
Reviewed-on: http://codereview.qt-project.org/6136
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Thu, 6 Oct 2011 09:43:26 +0000 (11:43 +0200)]
Doc: remove if defs
Change-Id: I0843e1ebb07b3974e13d63f75303c31fab892683
Reviewed-on: http://codereview.qt-project.org/6135
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Wed, 5 Oct 2011 15:20:29 +0000 (17:20 +0200)]
Doc: viewing tutorials while opening and creating projects.
Target selection is not necessary if only one target is installed.
Task-number: QTCREATORBUG-6237
Change-Id: I26da73aa6d0040f3d86fd485c354b40f86471245
Reviewed-on: http://codereview.qt-project.org/6037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit
21f3a69d4ca4d3d92bbae4b29315ddb1ec4c7e29)
Reviewed-on: http://codereview.qt-project.org/6125
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Eike Ziller [Thu, 6 Oct 2011 07:46:03 +0000 (09:46 +0200)]
Commit things that went missing from
2a4a56b2beec7a3c0be94302146461d2f730315d
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Thu, 29 Sep 2011 10:42:14 +0000 (12:42 +0200)]
QmlJS: Improve error message.
This first line of an error needs to make sense on its own.
Change-Id: Ibf3bce7107e8b3df8fa4d0e75924945027678c63
Reviewed-on: http://codereview.qt-project.org/6114
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Eike Ziller [Mon, 29 Aug 2011 14:27:26 +0000 (16:27 +0200)]
Load plugins from user config directory too.
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.
Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 15:28:24 +0000 (15:28 +0000)]
Git: Save settings
VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(
Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 14:32:30 +0000 (14:32 +0000)]
Git: Remove GitCommand
Use VCSBase::Command instead.
Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
cerf [Wed, 5 Oct 2011 15:32:16 +0000 (15:32 +0000)]
vcsbase: throw away VCSJobRunner, replaced by GitCommand
VCSBase::Command was created from GitCommand, it replaces VCSJobRunner.
VCSBase::Command is simpler to use (in VCSBaseClient) and commands
can show up in the progress manager.
From now on, the git plugin can easily rely on vcsbase.
Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec
Merge-request: 394
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6078
Thomas Hartmann [Wed, 5 Oct 2011 15:16:08 +0000 (17:16 +0200)]
QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS
Allows using qml files referencing qrc resources in the designer.
Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Wed, 5 Oct 2011 14:39:30 +0000 (16:39 +0200)]
QmlDesigner.instances: create working stand-in object
Create an Item as stand-in.
Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Thomas Hartmann [Wed, 5 Oct 2011 14:14:17 +0000 (16:14 +0200)]
WelcomePage: reducing size of view
Otherwise we might get an unnecessary scrollbar.
Change-Id: I12ab2288a02f32f542420b0e979c24aeaa00522d
Reviewed-on: http://codereview.qt-project.org/6063
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Wed, 5 Oct 2011 13:14:23 +0000 (15:14 +0200)]
WelcomePage: fix tabbar
Change-Id: Ic45a2bbc4773e903d8fa955b519171bed935f38e
Reviewed-on: http://codereview.qt-project.org/6062
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Aurindam Jana [Sat, 1 Oct 2011 14:21:59 +0000 (16:21 +0200)]
QmlJsDebugger: Handle Breakpoint states correctly.
The QmlJsDebugger likes to remove breakpoints in the
BreakpointInsertProceeding state. The state transition from
BreakpointInsertProceeding to BreakpointRemoveRequested is now
allowed. The state of breakpoint is set to BreakpointInserted
only when the breakpoint is hit.
Change-Id: I2fdd8d916363866fd920af7488f78d92df54d93b
Reviewed-on: http://codereview.qt-project.org/5899
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Tobias Hunger [Wed, 5 Oct 2011 12:41:27 +0000 (12:41 +0000)]
CERC: Use invalid ABI
Use a invalid ABI since we have no idea what we will end up running.
Make the debugger figure out specifics when needed.
Change-Id: Ia74080887617a097a16d789dfd7f88458409a23c
Reviewed-on: http://codereview.qt-project.org/6065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 14:38:28 +0000 (14:38 +0000)]
Fix build on windows
Change-Id: Ifaa6468ca17cba1de808a9cbeba325925985ee10
Reviewed-on: http://codereview.qt-project.org/6077
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 14:20:14 +0000 (14:20 +0000)]
Fix rebase issue and warning
Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 10:35:24 +0000 (10:35 +0000)]
git: Reuse more code from vcsbase
Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 10:30:06 +0000 (10:30 +0000)]
git: coding style fixes
Change-Id: I554e46cc5e3c1b55bc245f20f7f9541103afb8c5
Reviewed-on: http://codereview.qt-project.org/6070
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 10:19:40 +0000 (10:19 +0000)]
Git: Remove debug code
Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Tue, 4 Oct 2011 15:57:17 +0000 (15:57 +0000)]
VCS: Unify VCS options pages a bit
Change-Id: Ibf2e2871a8e7cd61ade67caf0d110359ffba71d5
Reviewed-on: http://codereview.qt-project.org/5999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kandeler [Wed, 5 Oct 2011 13:39:24 +0000 (15:39 +0200)]
Qt4ProjectManager: Remove outdated forward declaration.
Change-Id: I10024c9762c748d119afe559ea2838adf5e13739
Reviewed-on: http://codereview.qt-project.org/6067
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Tobias Hunger [Wed, 5 Oct 2011 13:27:18 +0000 (13:27 +0000)]
Use native separators in user visible string
Change-Id: Ic41e71e0f21fbf000202e8fc05262f5615b46c1d
Reviewed-on: http://codereview.qt-project.org/6066
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Robert Loehning [Wed, 5 Oct 2011 11:18:42 +0000 (13:18 +0200)]
Squish: Added test suite for debugger related tests
Change-Id: I11c114787cc3c2721147d55c86f87aaf31daec9e
Reviewed-on: http://codereview.qt-project.org/5644
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Kai Koehne [Tue, 4 Oct 2011 10:25:13 +0000 (12:25 +0200)]
Rename "Build Issues" pane to "Issues"
The issues pane now also contains e.g. results of an analyzer run and
QML warnings, so it's not only about 'Build Issues' any more.
Change-Id: Ifb9c79bd5b074e6811cc015560af3d72bf9dfcf2
Reviewed-on: http://codereview.qt-project.org/5977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Tobias Hunger [Tue, 20 Sep 2011 09:42:10 +0000 (09:42 +0000)]
Taskwindow: Speed up the task window
Make the taskwindow semi-graciously handle my Qt Creator build
with 91k build issues.
Change-Id: I47275e2057d2ff9bf5229f0a367bb19c4f3141e4
Task-number: QTCREATORBUG-1551
Reviewed-on: http://codereview.qt-project.org/5263
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kamm [Fri, 30 Sep 2011 07:03:00 +0000 (09:03 +0200)]
Qml snippets: Improve NumberAnimation and PropertyAction.
Change-Id: I684a764797cd75a231f3da611ca6afeabdd48f61
Reviewed-on: http://codereview.qt-project.org/5835
Reviewed-by: Lasse Holmstedt
Kai Koehne [Thu, 29 Sep 2011 13:12:43 +0000 (15:12 +0200)]
QmlCppDebugger: Set cpp breakpoints right on startup (again)
Previous commit allows to hit cpp breakpoints before the QML engine
is up and running, so there is no need anymore to set breakpoints early
on.
Change-Id: Ia0de490d54057d51c4585c56fa9083de982ba97b
Reviewed-on: http://codereview.qt-project.org/5896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Daniel Teske [Tue, 4 Oct 2011 13:40:30 +0000 (15:40 +0200)]
Use builddir not project dir for expanding relative libs paths
Change-Id: Id9743739fafe42c3d0f695cec0342b68544c64b0
Reviewed-on: http://codereview.qt-project.org/5992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Tue, 4 Oct 2011 10:29:36 +0000 (12:29 +0200)]
Add missing baseEnvironmentChanged signal
The base environment depends on *all* library pro files.
Do emit baseEnvironmentChanged accordingly.
Change-Id: Ia24f3d65492fbe7d2bb4f9fa9e46202ae1764213
Reviewed-on: http://codereview.qt-project.org/5991
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Fri, 30 Sep 2011 15:54:19 +0000 (17:54 +0200)]
QmlDebugger: Use QTC_CHECK where appropriate
Change-Id: Ide9ee35677a49c52788042df9fedffb4cf90f857
Reviewed-on: http://codereview.qt-project.org/5898
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Thu, 29 Sep 2011 14:49:18 +0000 (16:49 +0200)]
QmlCppDebugger: Decouple states of engines
The main engine now follows mostly the state of the gdb engine,
only if a breakpoint is hit/while stepping the state of the qml
engine is used. This allows us to hit C++ breakpoints at any time
(also when the qml engine hasn't been able to connect yet), and
also fixes the invalid transition warnings.
Change-Id: If67a56fd28b098952be2606d0a46e04c27835f66
Reviewed-on: http://codereview.qt-project.org/5897
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kandeler [Tue, 4 Oct 2011 12:22:25 +0000 (14:22 +0200)]
RemoteLinux: Support IPv6 connections in ports gatherer.
Change-Id: Id314517cbb0b0e943e08261eee922b2724dcaa49
Reviewed-on: http://codereview.qt-project.org/5982
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Tue, 4 Oct 2011 12:21:37 +0000 (14:21 +0200)]
SSH: Allow querying of IP protocol version.
Change-Id: I97c8b89da8c8d46afb0bdc840627e142567d5d98
Reviewed-on: http://codereview.qt-project.org/5981
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Kai Koehne [Thu, 29 Sep 2011 12:56:20 +0000 (14:56 +0200)]
QmlCppDebugger: Reshuffle DebuggerState case expressions
Use the same order as in the enum definition.
Change-Id: I80e220a9f6260cf91f153eb98e7520bb8e6ba36e
Reviewed-on: http://codereview.qt-project.org/5895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Tobias Hunger [Fri, 23 Sep 2011 15:53:55 +0000 (15:53 +0000)]
ABI: More unit test data
Change-Id: Ic7ff574db5a04deea9532f25b4083fa6649a0b19
Reviewed-on: http://codereview.qt-project.org/5470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Mon, 12 Sep 2011 16:33:00 +0000 (16:33 +0000)]
CDB: Set 32bit and 64bit debuggers as required
Task-number: QTCREATORBUG-6083
Change-Id: I8daac067d7c78a85c1e121c0a9870161e0e2aa27
Reviewed-on: http://codereview.qt-project.org/4748
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kandeler [Fri, 30 Sep 2011 11:35:31 +0000 (13:35 +0200)]
Debugger/gdb: Activate "target async" option in GUI.
Change-Id: Ic359d4af409993dfcc45ba95e6ab5e9287ef6d12
Reviewed-on: http://codereview.qt-project.org/5874
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Daniel Teske [Tue, 4 Oct 2011 10:52:29 +0000 (12:52 +0200)]
Fix restoring of Qt4Runconfigurations
Task-number: QTCREATORBUG-6228
Change-Id: Ib4f4890cb4c9ef10ddf2cdf3d6946601708ee7e6
Reviewed-on: http://codereview.qt-project.org/5979
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kamm [Fri, 30 Sep 2011 06:50:57 +0000 (08:50 +0200)]
Qml plugin wizard: Add uri annotation.
Change-Id: Ie207fe674ac92b5cbcace054f452dec5300e1222
Reviewed-on: http://codereview.qt-project.org/5833
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kamm [Tue, 4 Oct 2011 07:18:43 +0000 (09:18 +0200)]
CDB breakpoints: Fix line adjustment in case statements.
Task-number: QTCREATORBUG-6207
Change-Id: I4df50a412dd960a0d53a824a6c4a93712bd743e8
Reviewed-on: http://codereview.qt-project.org/5964
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Aurindam Jana [Wed, 28 Sep 2011 15:55:48 +0000 (17:55 +0200)]
Debugger: Change BreakpointOnSignalHandler to BreakpointOnQMLSignalHandler
Change-Id: Ic71299c38863cdb55862ced7348b2bdc9cf39555
Reviewed-on: http://codereview.qt-project.org/5743
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Leena Miettinen [Fri, 30 Sep 2011 11:49:39 +0000 (13:49 +0200)]
Doc: pulling out the debugging example to a separate file
Change-Id: I79e8272f9f42d749e6e4a34bb0400a2582ecf4b8
Reviewed-on: http://codereview.qt-project.org/5878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Christian Kamm [Fri, 30 Sep 2011 11:34:32 +0000 (13:34 +0200)]
Find: Increase delay between search highlight updates.
Currently when you type quickly in the current-file find text edit
it may feel slow because the highlights are updated for each keystroke.
This change increases the minimal delay between highlight updates from
10 ms to 50 ms. That means the delay is still barely noticeable, but
changing the search text stops feeling sluggish.
Change-Id: I41cf2a3282bdbd81afb6f6afb84d52fca16dd184
Reviewed-on: http://codereview.qt-project.org/5876
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Leena Miettinen [Fri, 30 Sep 2011 11:29:56 +0000 (13:29 +0200)]
Doc: fix next and previous links
Change-Id: I6959dcec6074857bbda9cfdcf973b3b941ab33ae
Reviewed-on: http://codereview.qt-project.org/5872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Fri, 30 Sep 2011 11:33:42 +0000 (13:33 +0200)]
Doc: qdoc does not understand special characters
You have to use \unicode commands, but those won't produce the correct
results within a \code command, so I cannot use them here.
Change-Id: I34ab32dd649bdf4167cfcd295ef1f9546a670ea5
Reviewed-on: http://codereview.qt-project.org/5873
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
hjk [Fri, 30 Sep 2011 10:28:55 +0000 (12:28 +0200)]
debugger: use common baseclass for all dock treeviews
Reduces amount of boilerplate code.
Change-Id: I048d901b4b80860df05f09b48650ea58b83fbc66
Reviewed-on: http://codereview.qt-project.org/5864
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Fri, 30 Sep 2011 08:45:11 +0000 (10:45 +0200)]
CppEditor: Add Quickfix for Qt 5 QStringLiteral.
Make replacement a parameter of the Operation class.
Change-Id: Ie9c013061d7045b3ee8c0e569e9df342dab38096
Reviewed-on: http://codereview.qt-project.org/5845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Friedemann Kleint [Fri, 30 Sep 2011 07:56:57 +0000 (09:56 +0200)]
Debugger[CDB]: Introduce setting for breakpoint correction.
Make it possible to turn it off in case something goes wrong.
Squeeze/polish the CDB options dialog and correct translation code
of the break options.
Task-number: QTCREATORBUG-6207
Change-Id: I1805558abd4478ab680b1e292bb13306b3a0ff05
Reviewed-on: http://codereview.qt-project.org/5838
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Thu, 29 Sep 2011 17:52:40 +0000 (19:52 +0200)]
Support ~ in qtversions.xml
Change-Id: I46b3380e7e593625342c900c83c25cc9d1964afb
Task-Nr: QTCREATORBUG-6193
Reviewed-on: http://codereview.qt-project.org/5816
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 29 Sep 2011 16:53:16 +0000 (18:53 +0200)]
debugger: work on locating debuginfo
Change-Id: I49b9375af757117d46ba68301b3f5b241b2f1766
Reviewed-on: http://codereview.qt-project.org/5815
Reviewed-by: hjk <qthjk@ovi.com>
Eike Ziller [Thu, 29 Sep 2011 15:50:51 +0000 (17:50 +0200)]
Build fix for windows.
Change-Id: I959ae0bd0938744b4afc55a804e476483ca9fdb5
Reviewed-on: http://codereview.qt-project.org/5810
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Thu, 29 Sep 2011 14:47:56 +0000 (16:47 +0200)]
Fix build
Change-Id: I22b1a24e619a9cb851f99c03792141a8b64e7b74
Reviewed-on: http://codereview.qt-project.org/5808
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Wed, 28 Sep 2011 18:55:20 +0000 (20:55 +0200)]
Squish: Added wildcard for Next-button in cmake wizard
Change-Id: I3a31e744699ffdc0ff1e099faa0e32c33b54de68
Reviewed-on: http://codereview.qt-project.org/5750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
hjk [Fri, 23 Sep 2011 15:06:08 +0000 (17:06 +0200)]
plain c++ app wizard: change name from 'qmake console'
Change-Id: I1e3b094c70d8f887d3cd451c961ae067b4423289
Reviewed-on: http://codereview.qt-project.org/5467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Thu, 15 Sep 2011 17:20:50 +0000 (19:20 +0200)]
Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.
Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Thu, 29 Sep 2011 13:00:15 +0000 (15:00 +0200)]
RemoteLinux: Make missing target path non-fatal.
There might be e.g. subprojects in a SUBDIRS project that are not
supposed to be deployed. Let's support this without forcing people to
use CONFIG variables, but emit a big fat warning.
Change-Id: I17c9337cecbf68c632ce925fa9a53655dcfaba64
Reviewed-on: http://codereview.qt-project.org/5801
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
hjk [Thu, 29 Sep 2011 12:46:59 +0000 (14:46 +0200)]
debugger: take actual breakpoints into account for source locations
Change-Id: I5cf2982812456249fca2f233514cb90bb8d3bfe0
Reviewed-on: http://codereview.qt-project.org/5799
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Wed, 28 Sep 2011 18:57:28 +0000 (20:57 +0200)]
Squish: Do not hook into subprocesses
With hooking, qmake is not being executed correctly on Linux.
Change-Id: I4dfd633485256bc351f55263c563987aa5a503a3
Reviewed-on: http://codereview.qt-project.org/5751
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
hjk [Wed, 28 Sep 2011 14:35:01 +0000 (16:35 +0200)]
projectexplorer: inline runsettingspropertiespage.ui
Change-Id: I291a5f0cf76721ade80ff72fc9c9d20b027bb1c5
Reviewed-on: http://codereview.qt-project.org/5736
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 14:16:24 +0000 (16:16 +0200)]
WelcomePage: hide buttons if not enough space
Change-Id: Ib33ddc8e060c2542e98dbf10b52efcfc3f010309
Reviewed-on: http://codereview.qt-project.org/5732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 14:15:29 +0000 (16:15 +0200)]
WelcomePage: layout change
The navigation bar now takes the complete width.
Change-Id: Ifc9ad9e7dd00e93d0946a712fdbb04ba41939482
Reviewed-on: http://codereview.qt-project.org/5731
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 28 Sep 2011 13:47:34 +0000 (15:47 +0200)]
settingspropertypages: style
Change-Id: I2430de067715374ae7e31fefacf3e7970db89754
Reviewed-on: http://codereview.qt-project.org/5735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Wed, 28 Sep 2011 14:38:57 +0000 (16:38 +0200)]
projectexplorer: this is never 0
Change-Id: I3245a7d46bc29480b3d8029e79f7b8fcb359ea90
Reviewed-on: http://codereview.qt-project.org/5737
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Wed, 28 Sep 2011 11:06:52 +0000 (13:06 +0200)]
Squish: Added constant defaultQtVersion
Change-Id: I72bf98000af9a46c8773d01233ba9e6006f527e6
Reviewed-on: http://codereview.qt-project.org/5643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 13:45:08 +0000 (15:45 +0200)]
WelcomePage: fix for painting bug
The width and height is defined for the designer.
Change-Id: I8ac941a417f16f1cc960ef72395c197a545168bf
Reviewed-on: http://codereview.qt-project.org/5730
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 13:44:21 +0000 (15:44 +0200)]
WelcomePage: nicer margins for HeaderItemView
Change-Id: Ia2ebedc3ca8b2077046093b3a4e229d661ea5e01
Reviewed-on: http://codereview.qt-project.org/5729
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 13:28:48 +0000 (15:28 +0200)]
WelcomePage: polish RecentProjects and RecentSessions
Change-Id: If78338c6a7b2bc534ccdf7065d361fcebba710ea
Reviewed-on: http://codereview.qt-project.org/5724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 13:28:13 +0000 (15:28 +0200)]
WelcomePage: no fixed sizes from buttons and tabs
Change-Id: Ie110cb3ad4d4aa355fcba1df5356cc9e4f1e3cfc
Reviewed-on: http://codereview.qt-project.org/5723
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Teske [Wed, 28 Sep 2011 13:38:48 +0000 (15:38 +0200)]
Fix setToolchain, ups
Change-Id: Ie300f6786336a663e12e52a2546e8ebf0458e080
Reviewed-by: pending
Reviewed-on: http://codereview.qt-project.org/5728
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 13:25:07 +0000 (15:25 +0200)]
WelcomePage: use remove instead of replace QChar()
QChar() == '0' != ''
Change-Id: Iec9e87eb3332088934660a73ec85e2726ef533fd
Reviewed-on: http://codereview.qt-project.org/5722
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Wed, 28 Sep 2011 13:15:09 +0000 (15:15 +0200)]
QmlJS: Fix saving and restoring QML scope objects.
Change-Id: I621d7c3dbc8d5613b5d9ffddd08acd582559990b
Reviewed-on: http://codereview.qt-project.org/5720
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
hjk [Tue, 27 Sep 2011 11:47:06 +0000 (13:47 +0200)]
IOutputPane: constify some member functions
Change-Id: I023b7f5976b30fc950d2dd5a76f749ef4720ac2f
Reviewed-on: http://codereview.qt-project.org/5618
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 11:41:44 +0000 (13:41 +0200)]
WelcomePage: fix memory leak
I use AutoReleased now.
Change-Id: I4fd5d04115ea8d0a04d3e7f5c4e96a934b5ae134
Reviewed-on: http://codereview.qt-project.org/5712
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Xiao Hongying [Wed, 21 Sep 2011 05:52:37 +0000 (13:52 +0800)]
qttest: Redesign the test tree widget to be more intuitive
The mouse click behavior should better match the established
creator standard.
Change-Id: Ie1792e0d5bed3a95d5f83569b50fe0ec8b778b15
Reviewed-on: http://codereview.qt-project.org/5442
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 10:49:55 +0000 (12:49 +0200)]
WelcomePage: polishing the welcome page
Major visual upgrade and refactoring.
I also added dummydata and a qmlproject file.
Change-Id: I5ebc6dfb4718a37bb20766669272b85bc9316316
Reviewed-on: http://codereview.qt-project.org/5708
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Wed, 28 Sep 2011 09:39:56 +0000 (11:39 +0200)]
WelcomePage: update of images
Change-Id: I9c2846b5b6df58f7c99a05cf4dc004ceba8c9e63
Reviewed-on: http://codereview.qt-project.org/5707
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Wed, 28 Sep 2011 10:26:22 +0000 (12:26 +0200)]
WelcomePage: create 2 instances of GettingStartedWelcomePage
GettingStartedWelcomePage gets instanciated twice now.
The new instance does show the examples and has the title:
"Demos and Examples".
The ExamplesListModel is shared between the two instances and is
a static member.
The method examplesModel() is used to access the ExamplesListModel and
lazily creates one.
QtSupportPlugin creates the two different instances.
Change-Id: Ie5bf9ce8b25aeeacb88731ce1d3179004175fd2f
Reviewed-on: http://codereview.qt-project.org/5706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Wed, 28 Sep 2011 09:32:32 +0000 (11:32 +0200)]
WelcomePage: adding hasSearchBar property to IWelcomePage
This property decides if the searchBar in the tool bar is shown or not.
Change-Id: Ic00da70a6427dff71b49f4341003d31b43338fed
Reviewed-on: http://codereview.qt-project.org/5705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Wed, 28 Sep 2011 09:30:30 +0000 (11:30 +0200)]
WelcomePage.exampleListModel: remove html text from description
This is needed because maximumLineCount is only supportted for plainText.
Change-Id: I8d05a7939603741985458ff7b40c8b33f11cbb1a
Reviewed-on: http://codereview.qt-project.org/5704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Wed, 28 Sep 2011 10:12:49 +0000 (12:12 +0200)]
Debugger: String usage fix.
Change-Id: Ia1fb09dee055f2507494b9666da7a6ada1103296
Reviewed-on: http://codereview.qt-project.org/5710
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Wed, 28 Sep 2011 10:00:29 +0000 (12:00 +0200)]
Fix endless evaluate loop for invalid qts
Change-Id: Id4ba165f95876cc0b986f5db7e6a788c3fdb2dc0
Reviewed-on: http://codereview.qt-project.org/5709
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Mon, 26 Sep 2011 12:38:42 +0000 (14:38 +0200)]
QmlDesigner.desktopPlugin: fix for plugindestdir
Change-Id: I31a725f4398345ae850361faa364ecdcb7ca7b2d
Reviewed-on: http://codereview.qt-project.org/5703
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kandeler [Wed, 28 Sep 2011 08:54:53 +0000 (10:54 +0200)]
RemoteLinux: Allow more space for device configuration names...
... in the wizard page.
Change-Id: Id4bab406667d321d8fcf3639976f89114b12a316
Reviewed-on: http://codereview.qt-project.org/5697
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Wed, 28 Sep 2011 08:35:21 +0000 (10:35 +0200)]
C++ switch header/source: Always prefer file in same directory.
Change-Id: I4c029919dd0bd9103bfdb1604026745d07e5535a
Reviewed-on: http://codereview.qt-project.org/5692
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kandeler [Wed, 28 Sep 2011 08:30:16 +0000 (10:30 +0200)]
RemoteLinux: Make strings translateable.
We erroneously used QLatin1String() instead of tr() in a few places.
Change-Id: I728585d0a0c754322b0df29a062e215951f48165
Reviewed-on: http://codereview.qt-project.org/5689
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Wed, 28 Sep 2011 08:14:16 +0000 (10:14 +0200)]
RemoteLinux: Introduce default name to device wizard page.
Also use better default config names for generic Linux and Madde.
Change-Id: I6755d9060b9bb9e2901363a42e6cd593238d4110
Reviewed-on: http://codereview.qt-project.org/5686
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Leandro Melo [Wed, 28 Sep 2011 07:53:26 +0000 (09:53 +0200)]
Gen. highlihter: Connect before calling setFuture
Change-Id: I767896ea686621a9c22aae299a927d6b86b9abeb
Reviewed-on: http://codereview.qt-project.org/5685
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Friedemann Kleint [Wed, 28 Sep 2011 07:52:21 +0000 (09:52 +0200)]
Designer: Trigger code setting suffixes on promoted widgets.
Initial-patch-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Change-Id: I28c03f29f69e4589aba9b5c234c86ec659f34c5a
Reviewed-on: http://codereview.qt-project.org/5683
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kamm [Tue, 27 Sep 2011 13:12:22 +0000 (15:12 +0200)]
QmlJS: Support .import directives in js files.
* Allow .import...
* Fix parsing of JS files when using Lexer::scanDirectives()
* Clean up ImportInfo construction.
* Rename ImportInfo::id to ImportInfo::as.
Change-Id: I888da248f06dc6184db99aa74c3b50d7f2f5e491
Reviewed-on: http://codereview.qt-project.org/5625
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Eike Ziller [Tue, 27 Sep 2011 14:18:29 +0000 (16:18 +0200)]
Use absolute path for xterm on Mac and remove unused file.
xterm is (no longer?) in the PATH on Mac, so we need to point to it
directly.
Task-number: QTCREATORBUG-6150
Change-Id: I84202d0ebac1b8875c890116cce960898f65e5f9
Reviewed-on: http://codereview.qt-project.org/5303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christian Kandeler [Tue, 27 Sep 2011 15:17:23 +0000 (17:17 +0200)]
RemoteLinux: Add support for alternate remote command.
Sometimes, it is not the deployed binary that we want to call, but e.g.
some wrapper.
Change-Id: Ic8fe8f865cc29bf01e64b3781a92362b4521d8e4
Reviewed-on: http://codereview.qt-project.org/5642
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 14:42:37 +0000 (16:42 +0200)]
Doc: cannot specify a folder as a dependency
Change-Id: I3f3ac0c2cabb7b660ff6ab8646563190df29c499
Reviewed-on: http://codereview.qt-project.org/5639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leandro Melo [Tue, 27 Sep 2011 14:09:15 +0000 (16:09 +0200)]
Gen. highlighter: Manager refactor and pending issues fixes
Some renamings for better clarity and re-structure how the gathering of definitions
is done. There where issues concerning mainly synchronization. Also make control
over the future interface better.
Change-Id: I5a51a391106872acd75d84cea4bcf7e9d7495a6d
Reviewed-on: http://codereview.qt-project.org/5636
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
hjk [Fri, 23 Sep 2011 15:09:23 +0000 (17:09 +0200)]
a simple 'new project' wizard for a plain C project
Change-Id: Ie3102362af67858790ff3121d2db56a7183906d4
Reviewed-on: http://codereview.qt-project.org/5468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 09:59:26 +0000 (11:59 +0200)]
Doc: move info about Qt Designer and Qt widgets to a separate folder
Change-Id: I92efa66d0dc1f8ed35e16f7f8b5293806355a400
Reviewed-on: http://codereview.qt-project.org/5614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 09:58:46 +0000 (11:58 +0200)]
Doc: move info about Symbian target to a separate folder
Change-Id: I93db9d03057f9f80a041447f41eefe98f8b4c41c
Reviewed-on: http://codereview.qt-project.org/5613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 09:56:42 +0000 (11:56 +0200)]
Doc: move Qt Quick topics to a separate folder
Change-Id: I020cb65cc343f933bea925de368f09c9c4f7b879
Reviewed-on: http://codereview.qt-project.org/5612
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 09:55:44 +0000 (11:55 +0200)]
Doc: move projects mode topics to a separate folder
Change-Id: I031e1f488c4923baea0bddbd24da804f3bb01c95
Reviewed-on: http://codereview.qt-project.org/5611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Tue, 27 Sep 2011 09:54:44 +0000 (11:54 +0200)]
Doc: move misc overview topics to a separate folder
Change-Id: I7bcf4edb2e23c669b000e08a1d6ce14b3982fd0d
Reviewed-on: http://codereview.qt-project.org/5610
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>