Commit Graph

4400 Commits

Author SHA1 Message Date
Robert Loehning
a426cadeec Squish: Added Fremantle target
Change-Id: I4c7d5a053d42693e658e82699e9339c1a72d0057
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-03 14:52:17 +02:00
Robert Loehning
b9c58161e4 Squish: Partly revert "Removal of Symbian support"
This reverts commit ae23d50576.

Change-Id: I03cccd11022b66e90489e23ab360704ba4a357cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-03 12:41:27 +02:00
Eike Ziller
a225e5b867 Merge remote-tracking branch 'origin/2.6' 2012-09-03 09:08:49 +02:00
Robert Loehning
a37eca63b6 Squish: Added Qt Simulator target
Change-Id: I367dc2fb71339a335700d7411465b16ec114a7eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-31 17:36:06 +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
Orgad Shaneh
fb6b15f957 Remove stale shared/json directory
Symbian leftovers

Change-Id: I4479113b6f80eb4a667054d72da1b185c315f61d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 15:53:43 +02:00
Robert Loehning
c00a76bde3 Squish: Partly revert "remotelinux: rename LinuxDeviceConfiguration to LinuxDevice"
This reverts commit 6460254931

Change-Id: Ifa0aaf19787a0d73ddf1a6d3dfe690bbfa8b4e1e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-30 14:19:12 +02:00
Robert Loehning
a39ad794a7 Squish: Removed workaround for closed bug
Change-Id: I6532c7d9639d587663a204d401295d67b2310d8b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-30 14:18:59 +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
Leandro Melo
d87835cc90 C++: Always skip unknown preprocessor "directives"
Task-number: QTCREATORBUG-7780

Change-Id: Ie93704feff17ad8229e50fb1133048f2c7598dea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 16:07:40 +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
Christian Stenger
ec1fd75f7b Squish: Fix hooking into Qml project
Change-Id: I358a6ac7acacb44f23161019d3d2a83e5d6e84cc
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-24 16:36:42 +02:00
Christian Stenger
2cd6db04bf Squish: Fix breakpoint line number
Generated main.qml has changed.

Change-Id: I697e9346e2fc45f5c5423b2f9d9892a601a38c75
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-24 09:37:58 +02:00
Marco Bubke
26630c3de0 QmlDesigner.Tests: Fix formating
Change-Id: I466a0e808fc7da8516421ee46c1a09ca1d0a0144
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-23 17:02:33 +02:00
Leandro Melo
009d6b1e2f C++: Handle C++ style comments in macro expansion
Notice that a similar problem still exists for which we
need to fix the lexer when there's a C style commend which
 ends with a backslash-newline.

Task-number: QTCREATORBUG-7713

Change-Id: I0f6d561703984f917fa5ed29de020ad0bdc5aaf0
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 15:00:53 +02:00
Leandro Melo
b53d562816 C++: Take multiline strings into account when preprocessing
It was creating extra line(s)...

Change-Id: If28a9ccf16195c71747479db838a5589ea6683a0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-23 14:35:53 +02:00
Christian Stenger
f1c5b1e78d Squish: Fix __configureCustomExecutable__()
Change-Id: I76ebec620ece569b895f381e9b35f3b257fe4852
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-22 16:22:28 +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 Stenger
2b0fb76f79 Squish: Fix for changed QmlApplicationViewer code
Change-Id: Ia8f1b69bdeff029ff5cb1513bab90c41c33b210e
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-21 17:31:58 +02:00
Christian Stenger
f33d0179a7 Squish: Fix for UI change
Implementation of TargetSelector has changed - this patch adjusts the
click positions for build and run settings.

Change-Id: Id65a00d8dba66d6be158ca86969795ce1196e569
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-21 17:24:01 +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
Christian Kandeler
26c4329f74 Name demangler: Fix reference collapsing.
Change-Id: I7bcf1ace346ffcb5e05242f6cedfc5439c97fff9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-13 12:30:10 +02:00
Robert Loehning
26c937e512 Squish: Don't wait for warning on Windows
Currently, it's not being shown.

Task-number: QTCREATORBUG-7704

Change-Id: I3fbcce411b205c7ece30dc6de421b0a0a10b7ab3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-08 10:30:34 +02:00
Christian Stenger
a9209c92c9 Squish: Fix verifyBuildConfig()
Removed dependency to the scrollArea that might be missing for
1-target projects. This makes tst_simple_debug almost finish.

Change-Id: Ia261192a0eb3ac10df4c0a2442368b0434842539
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-07 14:23:59 +02:00
Christian Stenger
6078d7e028 Squish: Fix handling of project settings
This patch handles the removed Qt version combobox.
If applied this should let some more tests (using compile or debug)
run to the end.

Change-Id: I288eda85eb7bdc62309252bfe883608a50b7fb8d
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-07 14:23:51 +02:00
Christian Kamm
41e140da04 C++: Fix line number information after multiline comments.
Task-number: QTCREATORBUG-7702
Change-Id: I0ec2e1eb9bf1c556b0a426d4405df1c48b5653ed
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-08-07 11:31:06 +02:00
Christian Stenger
336511dd99 Squish: Fix workaround
This patch fixes the workaround for QTCREATORBUG-6994 which is
crashing the Squish test tst_create_proj_wizard regularly.

Change-Id: I5d66994b49e25a2c41cf330e4bd8cf0b5269f76d
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-07 09:34:22 +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
Christian Stenger
7f962aeb6b Squish: Fix setRunInTerminal for 1-target-projects
This fix just removes the dependency to the scrollArea
that exists when there are more than 1 targets but is
missing when there's only 1 target available.

Change-Id: I02594aa5226f53ffaa5e3693b8075f5ef88c5f88
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-31 15:36:23 +02:00
Christian Kandeler
873ed7186f Name demangler: Fix some substitution bugs.
Also try to collapse references as much as it is possible with the
current design.

Change-Id: I1de55eac2d681a36f8b77d77968c4a06d19b6fac
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-25 11:45:53 +02:00
Robert Loehning
e0ffb2f6e0 Squish: Updated tst_build_speedcrunch
Change-Id: Ie5228fec880b3c9c1d5c24799973107677b724f3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-24 14:57:35 +02:00
Robert Loehning
bef8f58fe8 Squish: Updated calls to iterateBuildConfigs
Change-Id: Idca2d311399194b455e211fb72d1fcf810cbb624
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-24 13:55:33 +02:00
Christian Stenger
a4fa090e11 Squish: Improve handling for 1-target-projects
If there's only one suitable target for a project
the TargetSelector will be missing and the DoubleTabWidget
must be used instead.

Change-Id: I140b483d8afaaed7f25a3adb58bab65bffbf7322
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-24 09:04:43 +02:00
Robert Loehning
abe5f8ad92 Squish: Added toolchain
Change-Id: I411cdd7e0dcc913b3c858a64e32e3d761158a10f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-23 15:48:45 +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