Eike Ziller
d5d1c5e394
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/libs/utils/fileutils.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/genericdirectuploadservice.cpp
src/tools/qtcreatorcrashhandler/main.cpp
Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Christian Stenger
38e27f8056
Squish: Fix checkDebuggingLibrary()
...
Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
when using iterateKits() as well
Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
2012-10-09 10:03:22 +02:00
Eike Ziller
a55d47544a
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
qtcreator.qbp
src/plugins/qtsupport/baseqtversion.cpp
src/tools/tools.pro
Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
Robert Loehning
e51863ee1a
Squish: More explicit name for Desktop kit
...
Change-Id: Ibc711e37ca71d3543a8fa8b46fb2ac7c9c5c4129
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2012-09-25 14:11:12 +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
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
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
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
525cf2353e
Squish: Support more than one breakpoint per file
...
Change-Id: Ic33e039fe5aea9caed5a3e992a74938e331e2a4b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com >
2012-05-16 18:31:13 +02:00
Robert Loehning
49a3f0129a
Squish: Run tst_simple_debug with Qt 4.7
...
Change-Id: Ibc330a7ca3e1c378c78cf8eb4c559c2a99c3d8d0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com >
2012-05-11 21:15:51 +02:00
Christian Stenger
aa3a2dc926
Squish: Added debug test case
...
This is intended to be a starting point.
Change-Id: I0941ed16876810832aa6088287f8062bba6a273e
Reviewed-by: Robert Löhning <robert.loehning@nokia.com >
2012-04-27 17:52:25 +02:00
