Commit Graph

314 Commits

Author SHA1 Message Date
Christian Stenger
e98a947998 Squish: Use global objects.map from inside CSUP
Change-Id: I70b80f926d01f801f842cd45ca3710b9d16de273
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 12:45:15 +02:00
Robert Loehning
e16eb7ea43 Removed unneeded and mistyped HTML
Change-Id: I49f50fc213b88af478c1411933630eb705898c23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-11 08:19:33 +02:00
Robert Loehning
394f6d2db6 Squish: Updated getConfiguredKits()
Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-07 16:08:03 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:38 +02:00
Christian Stenger
e216d43649 Squish: Substitute tilde inside toolchains
Change-Id: Ibf0ddfa4aecaa669d843d28f83fe6d814faeb219
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:30 +02:00
Christian Stenger
6e1ac1aafa Squish: Use global objects.map from inside APTW
Change-Id: Ica05af5652a3666277723e6ef9e96ecd5dc0c9f5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 15:26:50 +02:00
Christian Stenger
a792576a09 Squish: Fix for modified and new project template
Change-Id: I352a7164391531b6cb48facfb83e56bfadf3c21c
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 15:26:38 +02:00
Christian Stenger
efa91f005b Squish: Fix for renaming Targets to Kits
Change-Id: Ia3faec39499bc7e65d5d0a0fb7963fcb4016c6d5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 13:55:21 +02:00
Robert Loehning
3767ecf872 Squish: Updated class for new target name
Change-Id: I5eca3251b290e15eaa2a462bc22f1d1ac7153834
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-04 17:13:59 +02:00
Christian Stenger
203b03f823 Squish: Fix for missing scrollArea
Change-Id: I5419b30b8dd0cc67af4d54a3bb89edd5368cb983
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-04 16:53:28 +02:00
Christian Stenger
ac6ca18ec0 Squish: Fix tst_create_proj_wizard
Change-Id: Ibccb5b6c1496d5ae4c9021086d55dc4236f6ac71
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-03 17:48:55 +02:00
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
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
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
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
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
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 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
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
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
Eike Ziller
93cf0f126e Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/zeroconf/embed/DebugServices.h
	tests/system/shared/project.py

Change-Id: I990f6b87ef8570317caf705bbca465a1a01f64b2
2012-07-19 09:16:52 +02:00
Christian Stenger
7184fabfc7 Squish: Fix openQmakeProject()
This fixes openQmakeProject(). There's still more
to do (e.g. selecting Release/Debug) what will be
done in later patch(es).

Change-Id: I34ebf793c89b2d2ddf1f97c7eed6c6eb6c7f5bcb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-13 17:10:17 +02:00
Robert Loehning
1d27304628 Squish: Added Desktop target
Change-Id: I3b44bb1083fbfb6624bed4226ab752f6bd81f79f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-12 16:53:46 +02:00
Robert Loehning
06cad70310 Squish: Updated __selectQtVersionDesktop__
Change-Id: I45b870c9f0def59f11196c98a446a506ce672049
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-12 16:53:25 +02:00
Bill King
a8debd265f Fix to handle situation where Harmattan isn't found in list of targets.
Change-Id: I7de9e62f756f0c8ea8858853d59bf3743e053ab0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-03 14:30:22 +02:00
Robert Loehning
f9b8ae6a33 Squish: Moved and updated qtversion.xml
Change-Id: I2e15c2926c1079e21370663210e91fe144d8ef02
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-29 17:41:04 +02:00
Robert Loehning
0db4c917f4 Squish: Fixed HELP06 for master
Change-Id: Ic2e4f49502764e8835341c0d712c6c418d7259a5
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-26 15:27:21 +02:00
Robert Loehning
1776cee64b Squish: Check for elements in project tree
Change-Id: I11a74d6d9703871b20f9c0a59bf613717e6553ef
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-25 10:00:50 +02:00
Eike Ziller
6e2db0b66e Merge remote-tracking branch 'origin/2.5' 2012-06-20 14:52:30 +02:00
Robert Loehning
79ca1f3d7c Squish: Fixed missing suffixes in getEditorForFileSuffix
Change-Id: Iabda661a70a7656003b47aaf91de28c213d076dc
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-20 12:41:03 +02:00
Jan Kerekes
f22449b94a Squish: Added new test cases(4, 5) to c support suite
initial commit

Change-Id: If2fb169ac66ccbcc463e4cfef491ca4fb3e01c30
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-19 17:32:39 +02:00
Christian Stenger
eeb7ecbb40 Squish: Fix for UI change
Additionally changed waiting for TargetSelector
from 20s to only 5s.

Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-18 20:13:58 +02:00
Christian Stenger
89aaa96031 Squish: Fix project.py
* add Desktop as available target in __chooseTargets__()
* do shadow builds for Desktop targets in openQmakeProject()

This patch makes https://codereview.qt-project.org/#change,28038
pass for me on Linux as well.

Change-Id: I3a4395a401198756e6a7d6a38c0b024167088dc3
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-18 19:49:46 +02:00
Robert Loehning
56c7facc68 Squish: Testing GLSLEditor in tst_select_all
Change-Id: Ib1d16d7cb7fe108b23c9eca70da6b6de2f9c563a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-18 19:49:04 +02:00
Jan Kerekes
23c7665cc5 Squish: Added new test cases/suite for help functionality
initial commit

Change-Id: I20aae999dec164a29e40c2926e36c015526c17cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-12 19:00:24 +02:00
Christian Stenger
d77d0ae504 Squish: Fix for UI change
Change-Id: Ida522c026c41c8cd5bd29b9cca3bb6b9334c84c4
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-12 09:35:09 +02:00
Eike Ziller
1ccde24c77 Merge remote-tracking branch 'origin/2.5' 2012-06-11 16:39:38 +02:00
Robert Loehning
5d01b60d56 Squish: Avoid warning about missing Harmattan target in APTW01
Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-05 11:01:00 +02:00