Commit Graph

1038 Commits

Author SHA1 Message Date
hjk
fac636602f debugger: fix build of manual test app with Qt 5
Change-Id: I58f63941038978b665455025313faafc851bccc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-04 17:27:02 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
Christian Kandeler
a49e1e0104 SSH: Fix tests.
Enable compilation with Qt 5 and remove a warning.

Change-Id: Ieed6ef829551122f37b4ce052288f8e0f76c9716
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-26 11:39:38 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00
David Schulz
44177392ec Debugger: Add missing continue to simple test
Change-Id: Ief142db796db9392d7d910c98c0dd1425e5f1230
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 16:35:40 +02:00
hjk
19a7f66df3 debugger: add gnuplot based display for QVector
Change-Id: Ic24a0d77906a59bc2c216ef0d6dd655695e2033e
(cherry picked from commit 41ac231ddfbabec6c09101345cf4d1370646f027)
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-10 12:16:46 +02:00
Eike Ziller
a8c524d40a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/wizards/qtquickapp.cpp

Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b
2012-09-05 13:42:31 +02:00
Alessandro Portale
8d6566b68b QtQuick 2 Application Wizard
This patch adds a new variant of the good old ugly
QmlApplicationViewer wizard. The new one is QQuickView based,
and thus targets QtQuick2

Change-Id: I049223f644029e75bd15120b003c0ce4907a547a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 20:32:33 +02:00
Oswald Buddenhagen
475fe8ec8b move sysroot out of QMakeGlobals
it's a hack which is exclusive to ProFileEvaluator.

Change-Id: I86141dc8985330a8a1602ced002545a9eb0a646c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 19:42:07 +02:00
Oswald Buddenhagen
00e9be4246 make messages from dynamic code tell a useful location
"(eval)" does not exactly help to find the error source.

Change-Id: Iecd03e6a4909ca6d7eab846844ca4415ebfa3429
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:56:24 +02:00
Oswald Buddenhagen
0ad234b691 add tracing facilities to evaluator
as other output code which is enabled only in full qmake mode, this
prints directly to the console.

Change-Id: I6a1578818512fa3b0773faf276a1d56881eb06d7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 17:54:57 +02:00
Oswald Buddenhagen
07a7cad50b revamp command line argument parsing
the command line parser can be now integrated with a parser which
understands more options.

Change-Id: Ib9de352376b2f03dd466d577435f680702d1e2b9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-03 17:54:01 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Alessandro Portale
e6270852a3 Qt Quick App Wizards: Remove dead code
Initially, the wizard was able to make complex QML apps
with custom QML plugins deployable. That was then removed
from the UI. Let's now also remove the remainders.

Change-Id: If470d553c79d0e47bc8e4f0e814a0da2ef31bab6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 18:05:43 +02:00
hjk
4dc6be6d43 debugger: add manual test
Task-number: QTCREATORBUG-7770
Change-Id: Iecfd25e11748622afaebc320ea29d633f9e08638
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-30 12:02:18 +02:00
hjk
bef43adb79 debugger: fix manual test description for stack colouring
Feature worked, test description was wrong.

Task-number: QTCREATORBUG-7281
Change-Id: I81c93b66cb28e9d6adf15a49c086d5faaa908d0a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 16:28:39 +02:00
Oswald Buddenhagen
6529e874e4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/remotelinux/deploymentinfo.cpp

Change-Id: I92af9f9f558a76db78f838b0ccdfb8ad3d47af25
2012-08-28 15:13:32 +02:00
Christian Kandeler
edcf76613b SSH: Implement tunneling.
This is the "direct-tcpip" port forwarding
specified in RFC 4254.

Change-Id: I1ffa2e923b4479c7211b1b4304e66895b565fb64
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-28 15:12:04 +02:00
Oswald Buddenhagen
f35f55091d complain about missing input file
the parser explicitly excludes complaints about missing files (because
they are pretty common in cumulative mode), so we need to do it ourselves.

Change-Id: I3c36819ab7b26152271e4557b67fb36b0a595b60
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-28 14:37:41 +02:00
hjk
c8b180a55b debugger: also report sizes of anonymous structs
Change-Id: Ibd7397ddf9b70db599befe8cc99fcf7147b959e6
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 17:03:23 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Christian Kandeler
2e98952068 ProjectExplorer: Properly test device support.
Use Creator's test infrastructure instead of dumping the code
into tests/ where it will be forgotten.

Change-Id: I0db767ff68754e04d727671f4ecdd61fa9f75c1b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-21 15:24:16 +02:00
hjk
894e75aaf0 debugger: fix QStringList dumper
Did not take into account a non-zero 'begin' after a takeFirst().

Change-Id: Icaa1f87c18b1dec7778c4322fd971c9becedcce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 18:15:11 +02:00
hjk
319334bbbc debugger: add manual test for multiple breakpoints
Change-Id: I212e119c93e09319eeccd2b480db95ac99c7e0ba
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-13 13:08:33 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
Oswald Buddenhagen
60e96cbff5 make use of ProFileEvaluator::value()
no need to duplicate the code

Change-Id: Icc27e028dbb97faf9e48aba11dd5749526ee1e9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-02 13:45:52 +02:00
Oswald Buddenhagen
187751f967 add $$shadowed() function
follow suit with qmake ...

Change-Id: Ic97576eaf74dfd58e8d8cd2f8034dac3963b92c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:42:39 +02:00
Oswald Buddenhagen
c6d640d3cd allow override of qmake executable in testreader
that way even a testreader built against qt 4 can use qt 5 qmake.

Change-Id: I55636dc22bd13cd7dcdff7381e4f0162592bb781
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:37:26 +02:00
Oswald Buddenhagen
a93e24fd0d implement qmake language and deprecation warnings
Change-Id: Ia5dd0c408ace4e779da898ffb60e9ca12a383225
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:09:49 +02:00
Oswald Buddenhagen
0af96c128a revamp message callbacks
instead of having a bazillion different callbacks, have only one with a
type parameter. the drain typically multiplexes all into one stream anyway.

Change-Id: I963daefc5a266c91334a4cc599570ed26b603d5d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:09:33 +02:00
hjk
6460254931 remotelinux: rename LinuxDeviceConfiguration to LinuxDevice
Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-01 14:26:28 +02:00
hjk
a4fcd8d3cb debugger: allow (most of) the manual test being run gui-less
Change-Id: Ib620b33ea477b154a1ec64af6f57e392a1827e4d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:03:14 +02:00
hjk
d92df40125 debugger: fix display of member function pointers
Change-Id: I957e805aad45bf62b6fb8318accd29f54b474b11
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:01:26 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Oswald Buddenhagen
aca1c4bd50 introduce PROEVALUATOR_FULL #define
if this is enabled, the evaluator implements all functionality
necessary for qmake. without it, functionality which is unnecessary or
outright dangerous in qt creator or lupdate context is omitted.

Change-Id: I233cfa6daf2e4451f9f1d3d14711be2a7cfe4293
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:18:29 +02:00
Oswald Buddenhagen
0e6f6e3ca5 make $$QMAKE_QMAKE available to projects
not setting it outside the main project processing, as it's even less
likely to be needed there.

Change-Id: Ia7afe3a53bf0977d739bf23d7cd79e3a2aee8867
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:17:36 +02:00
Oswald Buddenhagen
41bf7c896b surround loading of spec with loading spec_pre.prf and spec_post.prf
follow suit with qmake ...

once we move currently builtin functionality to these feature files,
things would break with qt4 (which does not have them). consequently,
we provide our own fallback versions of them.

Change-Id: Ie318f3419d78214472835c41ec1388977f2e9269
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:00:00 +02:00
Oswald Buddenhagen
ac297f8e6b introduce QMakeHandler
this is QMakeEvaluatorHandler, but derived from QMakeParserHandler.
the idea is that the parser can be used stand-alone, while the evaluator
needs the parser as well.
we will need it in QMakeGlobals as well, so put it there, as that is the
most central place.

Change-Id: I6ee46c0e4b2e044bf3bfc6e4235b53525ddfc875
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:39:37 +02:00
Oswald Buddenhagen
b4f38671a2 move remainder of QMakeEvaluator to an own file
Change-Id: I09bf3ee41e08062e14a6810d8de036e1c246b0b5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:23:31 +02:00
Oswald Buddenhagen
7b3393918c move builtin qmake function implementations to separate file
the functions are still part of the same class, though.

Change-Id: I58a69d334ac9d1d53b5395d0b655895ffe18c7be
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:11:24 +02:00
Oswald Buddenhagen
c84fbe0455 move QMakeEvaluator declaration to an own file
Change-Id: Ifc13af5f5b8a2b497075027acfb7b621ab0514ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:40 +02:00
Oswald Buddenhagen
95dfa15a7c ProFileEvaluator::Private => QMakeEvaluator
more natural name. the ProFileEvaluator class itself is somewhat more
high-level, so it will remain named as it is. i'll move around the code
at a later point.

Change-Id: I03fa844d0109e281f3602b4781ac11c6f2954aa4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:23 +02:00
Oswald Buddenhagen
888c187dd5 ProFileParser => QMakeParser
more natural name

Change-Id: I38d2a2fc785686aa5777afe41452b53f2c24adf8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:05:03 +02:00
Oswald Buddenhagen
24f24c4546 factor QMakeGlobals into an own file
Change-Id: I55d24be06fa78f70bad614a7125c3079c92ab8e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:47 +02:00
Oswald Buddenhagen
37b2f88e27 ProFileOption => QMakeGlobals
more accurate class name

Change-Id: I4258b221727e79cc88d5f57dd1f6631ba0bba625
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:29 +02:00
hjk
bb31b2572f debugger: add manual test for pointer-to-derived case in QVector
Change-Id: I51db82d982351cdcf8ef64ba00521cb4d260bd45
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 15:25:54 +02:00
hjk
f5fe20ef31 debugger: add a pointer to global data to manual test
Change-Id: I6ebb0058f5c1717c2dd4224107d25544005a3116
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-13 13:16:28 +02:00
hjk
c68cf6dcd9 debugger: add example code for multiple sub-breakpoints to test
Change-Id: Ifa12a6124d37a29a9e294ed14c8a7433c24cafa3
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-13 10:17:46 +02:00
Christian Kandeler
79de09f266 SSH: Streamline SshRemoteProcessRunner's output handling.
Make it just like SshRemoteProcess (and QProcess). The current
implementation annoyingly forces client code to establish additional
signal/slot connections, even if they only want to evaluate the output
at the end.

Change-Id: Id8c30dd156574d7d26d848d8e0705856a16d3747
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 10:15:43 +02:00
Christian Kandeler
303e67304e SSH: Name SshRemoteProcess::ExitStatus values like the QProcess ones.
(We cannot use QProcess::ExitStatus itself, because it does not contain
FailedToStart.)

Change-Id: I83ed6de621e2693e539562cd8e56ef478fa4fcb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 10:12:11 +02:00