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 Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin 
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:57 +01:00
Christian Stenger
dae2198346 Squish: Fix tests for disabled Madde Plugin 
Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:49 +01:00
Robert Loehning
90ffdd8a6f Squish: Updated expected project tree to fixed behavior 
Task-number: QTCREATORBUG-8706
Change-Id: I0a7c3defec04417014dd185f501642ad37a12ff2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 15:07:26 +01:00
Christian Stenger
c7ca78afd0 Squish: Revert unsuccessful fix for build-machines 
Change-Id: I47865c18ba24ce8a732046597fe27f32c4edf3e3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 13:15:19 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication() 
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 10:30:37 +01:00
Christian Stenger
adc619c045 Squish: Update squish mapping file for new versions 
I've now provided the stripped down versions of Squish 4.2, so it's
time to update the mapping file as well.

Change-Id: Ie85c9c1a704d5d30a535ff197a5f8897f5259eb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-07 17:27:34 +01:00
Christian Stenger
18089cea55 Squish: Skip hook-into for mismatched Squish version 
If the Squish version of the running AUT and the subprocess do
not match hooking into the subprocess fails because of using
different protocols.

Change-Id: I2e94c5ec2fbdc30aa39885bf1619df445c10f40b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-07 16:57:58 +01:00
Robert Loehning
a3bdff07ac Squish: Fixed SCOM05 
Change-Id: I1ea55b1ffc811cb986eee28983f27a838e156805
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-07 11:35:22 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits 
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-06 13:49:14 +01:00
hjk
b612e9b13e Debugger: Qt4/Qt5 tests 
Change-Id: I210798d2cd3aa746e69d2637cc6ce51e01d5e057
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-05 02:34:55 +01:00
hjk
916d6b3048 Debugger: Make some more tests applicable to Qt 4 and Qt 5 
Change-Id: Ic5cd947a88feae0a1dc121050d06cac0b4f49043
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-04 23:49:31 +01:00
hjk
66ae6cef34 Debugger: Fix QDir dumper and auto-test 
Change-Id: I3dfac334e54873409e77cfc18c95cc5f27fba395
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-04 23:13:47 +01:00
hjk
cb53e38ab2 Debugger: Work on dumper auto-tests 
Change-Id: I1f0e43c8a22a1f03e9a1b97e94410af0b56415ee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-04 17:07:28 +01:00
Christian Stenger
8485f64c6b Squish: Fix verification of compile output 
Change-Id: I1c55e826a79fa0f36d2870cfcb08a325ba6408e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 16:47:05 +01:00
Christian Stenger
675b33e832 Squish: Let tst_rename_macros continue if it fails 
Change-Id: If4836259220f6439e7f2cc958ecfb19b56c94573
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 13:55:08 +01:00
hjk
39e15a0efe Debugger: Work on dumper auto tests 
Change-Id: I94a4ff9a2f76b1eb2aee83f4db827f7906d1e382
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 20:26:11 +01:00
hjk
cb1275fa33 Debugger: Work on dumper auto tests 
Change-Id: I3df1faef35fec270094fdfbcb360216f516d0208
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 18:55:44 +01:00
Robert Loehning
fc9ed4960d Squish: Fixed tst_qml_editor 
Change-Id: Ice53977c5d747d0e38943274e269c31c48bf14c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-01 17:09:49 +01:00
hjk
7cb97f89f9 Debugger: Re-enable some tests for QVariant and geometry classes 
Change-Id: Id8e0b46a7669fa2e7bb43687baa10ea951d9dc78
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 16:56:51 +01:00
hjk
13f3a6a5a0 Debugger: Fix QDateTime dumper and auto test 
Change-Id: I1e71fdda85d791f76b8300fd1301f08e6d1bab71
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 15:15:07 +01:00
hjk
b6ad8a0d91 Debugger: Make std:: type simplification accessible from test 
Change-Id: I26d9f656dac454c4e4ba51cab9b2120d8138462c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 15:14:37 +01:00
Nikolai Kosjar
4da344c0bf C++: ast2png: Try parsing harder 
Try to parse a declarator, if that fails an expression, if that fails,
...at last a TranslationUnit is tried. It is also possible to specify
which AST should be parsed.

This simplifies the code snippets we can pass to this tool.

Change-Id: Idbc1a8a6f1c5cf7e20d899f7a2e4263c7f9d33a6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-02-01 14:30:12 +01:00
Robert Loehning
2c7347b8ed Updated license headers 
Change-Id: I3ff71d3a686453e92ba8724e75a1879f48653d11
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 13:30:48 +01:00
Christian Stenger
df1f7796ba Squish: Fix tst_SCOM05 
Change-Id: I63b5266639a272ee94cc50978f87634f09ff4177
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-01 13:01:05 +01:00
hjk
54d662c2cd Debugger: Fix QDate and QTime dumper and auto test 
Change-Id: Iaf4cee3099a6745c5ccc42362463ec5203f8bfb0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 12:33:29 +01:00
hjk
0ea26fae85 Debugger: Fix dumper auto test for QByteArray with non-ASCII contents 
Change-Id: I358d9f69a0d8c090dd9c4766ab1792011f100ce5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-01 11:50:28 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Christian Stenger
e9f219c335 Squish: Fix tst_QMLS04 
Change-Id: I16e4873bf33433b2b87229506f300300faa9ef9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-01 09:02:22 +01:00
Robert Loehning
f71486fa4d Squish: Fixed tst_modify_readonly 
Change-Id: I8cce1e72dceb1085cb42f2cfa2bf8a7db721c564
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 17:31:58 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Christian Stenger
893b3da55d Squish: Fix tst_WELP02 
Change-Id: Ie45909e9967fdb1333da25bc85f93195374f44da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-31 16:24:37 +01:00
Christian Stenger
58c45ca766 Squish: Added test case for default settings 
Change-Id: I669a4a464b966ef9cf5a89f38e95e142e3574a1c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-31 16:16:33 +01:00
Robert Loehning
0a35cae99d Squish: Fixed tst_qml_indent 
Change-Id: I9edd5410896401810b5106049832c36221b155d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 16:02:57 +01:00
Robert Loehning
6ebb71ab57 Squish: Fixed tst_simple_debug 
Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 14:27:27 +01:00
Robert Loehning
14839e8acc Squish: Fixed suite_CSUP 
Change-Id: Iab9acd6124c70397a3eff0a697fc8df4b663cc1a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 13:34:01 +01:00
Robert Loehning
58e4a5fb5e Squish: Fixed opening of files 
Change-Id: Ia96a4a000cac1dde0f660e5f58141a73c7625a1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 11:22:17 +01:00
Przemyslaw Gorszkowski
ffba28d26a C++: Fix code compl. for instantiation of template specialization 
It works for full specialization. Instantiate of the partial
specialization has to be implemented(finding appropriate partial
specialization-on going)

Added unit test.

Change-Id: I8ef5ea963e7c665e0d67d390b3a833486773dab0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-01-30 18:49:25 +01:00
hjk
33ef5d1ce3 Debugger: fix deque and std::complex autotest 
Change-Id: Idf6d0cc5a038d8203d5ad4fd4ce2f001b9fc1647
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-30 14:42:19 +01:00
hjk
51523f3406 Debugger: enable auto tests for std::{unique,shared}_ptr 
Change-Id: If927cbed7b2638ad9468be8f092a7b896f8fc162
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-30 14:03:27 +01:00
hjk
9855c40bd1 Debugger: Fix some autotests 
Change-Id: I2b6d6882bfdb0d2622c3fc9d4628ad3d65f73062
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-30 12:04:06 +01:00
Przemyslaw Gorszkowski
421ea2afa4 C++: Test for nested class of enclosing template 
Added additional test for change:
23844410fd

Change-Id: I9ddd23b0e852bf88105fef87fae82620da29c0b6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-30 08:09:21 +01:00
Przemyslaw Gorszkowski
7db3b660b6 C++ editor: Highlight member variable 
Highlight member variable when there is also
enum value with the same name

Task-number: QTCREATORBUG-7525
Change-Id: I0990844a20fdf9e87a807fde10708344b9c3497b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-29 17:33:42 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
 2013-01-29 15:52:36 +01:00
Przemyslaw Gorszkowski
7fcc52bf47 C++ editor: Highlighting static variables 
Fix highlighting, find usages, marking for static variables.

Task-number: QTCREATORBUG-6822
Change-Id: I0c97c93c6c1024550907eec3820496df22a94e85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-29 14:01:11 +01:00
Nikolai Kosjar
370acaf502 C++: Tests: Add basic tests for CheckSymbols 
CheckSymbols is the "data provider" for the semantic highlighter which
does not have any tests yet.

Change-Id: I868aca32d44570457a984b8ce74695c381c58bed
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-01-29 09:09:15 +01:00
hjk
986ff71642 Debugger: re-enable more tests 
Change-Id: Iec02192477cebabd50da0f07b32e95b78eeb0078
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-28 18:16:30 +01:00
hjk
167316d7da Debugger: Work on auto tests 
Change-Id: I21e783407a904de3501d0ac89d5f6f497ae4b1fe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-28 17:17:25 +01:00
Christian Stenger
4cb9f675aa Squish: use new approach for markText() 
This new approach is a bit slower than using Qt functionality,
but it's now completely relying on user-interaction.

Change-Id: I361f6f201dfff8122a11aae30204eb79967fe4ae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-28 17:07:12 +01:00
Robert Loehning
31b135a4b1 Squish: Updated opening of CMake projects 
Change-Id: Iad89199052fe8df090eb5a6257dd88de51a15a07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-28 15:19:48 +01:00