feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
25,559 Commits 108 Branches 368 Tags
6d17da175f66a24143f676fc5b51a5b69b2b5cf4
Commit Graph

1813 Commits

Author SHA1 Message Date
Christian Stenger
75ee870259 Squish: Use global objects.map from inside SCOM 
Change-Id: Ib789dd239fb7dfbb684e2f97607aa30de205fe0b
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-13 10:02:46 +02:00
Christian Stenger
77a6b71f72 Squish: Use global objects.map from inside QMLS 
Change-Id: I5c37408bc3a0e232d7f2a70e01db510725f99df1
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 17:22:39 +02:00
Christian Stenger
7f98c517e1 Squish: Use global objects.map from inside HELP 
Change-Id: I3df21777eb06e002de318c094741e3ff878a5f17
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 14:08:44 +02:00
Christian Stenger
7218a2b428 Squish: Fix for UI change 
Change-Id: Ie3d0c8deae67020d7adcd2bd69807f190bc0be0a
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 12:56:47 +02:00
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
Christian Kamm
0df5933539 QmlJS indenter: Fix wrong indentation after list<> typed properties. 
Task-number: QTCREATORBUG-7726
Change-Id: If709a9a71cfed69e2f14af92c114f79d11d03145
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-10 14:21:57 +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
Leandro Melo
d1b65bbf83 C++: Discard comments in macro definitions 
Task-number: QTCREATORBUG-7815

Change-Id: Id3e6b018bfd58b0f0072c637d69721a4bde1603a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-05 16:35:33 +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
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
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
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
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