feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4400 Commits

Author SHA1 Message Date
Christian Kamm
813846232b C++11: Allow for brace initializers like T v{1, 2}. 
And add a basic test.

Change-Id: I3b8b87d51a9da154758d17380bba5922795f675c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-17 14:47:14 +02:00
Marco Bubke
410b5cfa2a Qmldesigner.Test: Fix gradient type versions 
Change-Id: Ie8534060b59e28020f1b7d4fb55d3555b0c84a13
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-14 12:49:08 +02:00
Marco Bubke
44d7c848ec QmlDesigner.Test: Fix model creation to version 1.1 
Change-Id: I9a6d30291ca02c72a08da96dc9be5199f0800a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 16:33:18 +02:00
Marco Bubke
1550bab21a QmlDesigner.Test: Fix import version 
Change-Id: I2e53ed6c727c539e04565595614ebedb62a902ec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 16:33:04 +02:00
Marco Bubke
edab369be8 QmlDesigner.Tests: Don't use helper function for custom rewriter 
Change-Id: I7994cd830392fed347d0dd8aacc6d578823fcc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:23:12 +02:00
Marco Bubke
1c08fce320 QmlDesigner.Tests: Change version of states items to 1.0 
Change-Id: I0216319b6ce0ca63daa1365a90b259ebb4503761
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:09:56 +02:00
Marco Bubke
d93fb08f8f QmlDesigner: Fix rewriter tests 
Change-Id: Ic715e8f64bcc17785c972f41b8ab2e00438441b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:09:37 +02:00
Robert Loehning
b99fd060e1 Squish: Updated tst_simple_debug 
Change-Id: Ida1508c5e2f15a3fc79066d5133b91c0f9e3affa
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-13 13:57:54 +02:00
Eike Ziller
9b6852ff0c Merge remote-tracking branch 'origin/2.6' 2012-09-13 13:16:07 +02:00
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
Marco Bubke
09674e4707 QmlDesigner.Test: More test fixes 
Change-Id: I14f45e6a50c2caac696346e37b4fcd325829d0d4
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-12 20:48:20 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6' 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
 2012-09-12 17:27:37 +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
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +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
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
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 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