feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,509 Commits 108 Branches 368 Tags
76bf971cb9545793d56bc7805622a4d5d4871711
Commit Graph

2079 Commits

Author SHA1 Message Date
Christian Kandeler
0d2b1aedeb Remove "icheck build" test. 
Does not build, is not being maintained, purpose is unclear.

Change-Id: I00f3bbc9580b57e3945882a411af502a78f4864f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-07 12:30:25 +02:00
Marco Bubke
b21f7ca7e5 QmlDesigner.Test: Default size is zero 
I'm a little bit unsure about that.

Change-Id: I9f319b11b494c5101a3e6ed59543067b9b4052f1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 21:37:18 +02:00
Marco Bubke
7267aa1611 QmlDesigner.Test: Remove magic 
Explicit code is more readable than some short magic. Yes, that is not
cool, but in the end more maintainable. ;-)

Change-Id: Iac2f4e2dc3c4d7aa4d9be1f1e9d7dc3231d4d375
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 17:25:29 +02:00
Marco Bubke
ae72dae1e7 QmlDesigner.Test: Fix expression 
Change-Id: I2c88112ceccc18741207c2bd78f72c787a862eb5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:35:14 +02:00
Marco Bubke
4518552e7b QmlDesigner.Test: Change the version of the Rectangle to 1.0 
Change-Id: I56f7bfe3a8a7f43e08a6f59623f7da0cceb194d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:35:06 +02:00
Marco Bubke
a13c3aeb2f QmlDesigner.Test: Refactor model creation 
Change-Id: I58f615f30029d2554ed26518343a9b77b594bd0d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:34:54 +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
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
Marco Bubke
4f0c97d0d6 QmlDesigner.Test: Fix spelling 
Change-Id: I16fb26cd859c0292f1f01b2a87de59df45d2bada
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:55:15 +02:00
Marco Bubke
f2468e16b6 QmlDesigner.Test: Change qtquick version to 1.1 
Change-Id: Ief61ae32b2321637194e9ca9ea9064fd67956c06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:55:02 +02:00
Marco Bubke
d7b1928b67 QmlDesigner.Test: Fix type versions 
Change-Id: I2450094776b50dbaf7ad41807990d3505057ab8d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:54:49 +02:00
Marco Bubke
76323d6e1e QmlDesigner.Test: Fix type names 
Change-Id: Iff89e88db48cf4026142862590cbb5b7d7c0370e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:54:01 +02:00
Marco Bubke
f8430d3935 Qmldesigner.Test: fix plugin path 
Change-Id: I159886b1b487b3bf085d0ceab64ed0f075ea8833
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:52:53 +02:00
Eike Ziller
887456e38a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
 2012-09-04 18:04:16 +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
Marco Bubke
139d08b143 QmlDesigner.Test: Remove messages 
Change-Id: I8b72b60458957c8db698adf7742f5db34c65b2ac
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-04 15:41:11 +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
Marco Bubke
b19bebbfa5 QmlDesigner.Tests: Compiling again 
Change-Id: I85a7fc5c37d9beea6e2433a9fd2a3ef779f0d63c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-03 18:02:15 +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
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
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