feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

6168 Commits

Author SHA1 Message Date
Robert Loehning
017e108724 Squish: Update expected values after fix. 
QTCREATORBUG-10045 which tst_openqt_creator found was fixed.

Change-Id: I804427276d37ca97ce4577e40cfa73d515218de5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-27 12:27:25 +02:00
Robert Loehning
532292cbb5 Revert "Squish: Remove failing lines for tst_openqt_creator" 
Change-Id: Id876fca6e2b192097fed802eca4fe28533a7d4e9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-27 12:27:08 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
hjk
c372f7b601 Rename share/dumper to share/debugger and {l,g}bridge to {lldb,gdb}bridge 
Change-Id: I56a09dd89d2ac086ee264432510fd39b5efe69c5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-26 21:50:40 +02:00
Robert Loehning
65f0588196 Squish: Stabilize suite_QMLS 
Change-Id: I2194054c9c87eeff3b039b34dc4498f5cb0a19e2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-25 17:04:49 +02:00
Robert Loehning
52921e72c9 Squish: Update tst_HELP06 
Change-Id: I4cfadb96ba27a1c95739d07f161e1579df9ce8ba
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-25 14:55:25 +02:00
Andre Hartmann
e8a1b8c551 ANSI: More meaningful name for simple tests. 
Change-Id: I105e8766b1a19e367337a9be9436cc762b69b8be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-09-25 07:12:27 +02:00
Andre Hartmann
30ddaad191 ANSI: Test line-overlapping formats. 
Until endFormatScope() is called, continuation lines keep the last
format.

Change-Id: Ic68ae6d716519f537189ebae763da4dc2c30978d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-09-25 07:11:46 +02:00
hjk
f55cd63622 Debugger: Fix QList<QStringList> dumper with Qt 5 
QStringList is movable in Qt 5.

Task-number: QTCREATORBUG-10211
Change-Id: I6b94acd37bbf8ca165960c50fd3da81408ccbb1b
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-09-24 14:49:03 +02:00
Robert Loehning
fbeac46c60 Squish: Update number of kits 
Only one kit in use now. According to dt it's gonna stay this way.

Change-Id: Id52f04db438eda8d9eebf79264c7ddd28a0f497e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-24 13:40:52 +02:00
Christian Stenger
71e9321e49 Tests: Fix compilation of valgrind test apps on Win 
Change-Id: I09ecc4b5a44bcc401e970b3da94d628877a49078
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-20 17:20:27 +02:00
Robert Loehning
ee1bac2ee6 Squish: Fix verifyBuildAndRun() 
"The program has unexpectedly finished." is considered valid output,
see https://bugreports.qt-project.org/browse/QTCREATORBUG-9212

Change-Id: Ia18e2dcfccdf1bdfbbc793a01897a88c4a17eb40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 13:47:55 +02:00
Christian Stenger
8b7dff6fdc Squish: Fix tst_debug_empty_main for Mac 
Change-Id: I57cd9647d07cfbf823bdff63dd1c2f5c3050cb7c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-20 12:48:03 +02:00
Christian Stenger
5bf5eb17f1 Squish: Fix addBranchWildcardToRoot() 
Branch information is now listed in square brackets.

Change-Id: I4f38f2a93b8029ed319fae3a7c32adc0aba50660
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-20 12:47:39 +02:00
Robert Loehning
5d1aece721 Squish: Fix tst_default_settings 
Change-Id: I2b9e03d77df657b107bc81d3b8f16720c25b4a0e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:56 +02:00
Robert Loehning
0e0d8eb7bb Squish: Update editors 
Change-Id: I022d0c5b2e025106860ea330f6b690842bb0558c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:36 +02:00
Robert Loehning
76cfe9e30e Squish: Update expected window title in tst_basic_cpp_support 
Change-Id: Ic5d23a899d1b808780f76ef53c855397cc436c2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 10:59:51 +02:00
Christian Kandeler
dcd6a9e9cf qbs project files: Remove workarounds for qbs bug. 
The imports work as expected now.

Change-Id: I753483696bd30512451af4b8c39f95e30a513d40
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-19 13:28:21 +02:00
Christian Kandeler
203a775652 qbs project files: Rename defaults.js to functions.js. 
The old name does not fit anymore.

Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-19 13:28:04 +02:00
hjk
7971b6e714 Debugger: Make dumpers a bit more Python 3.x friendly 
Looks like Ubuntu 13.10 will ship GDB linked to Python 3.3.

Change-Id: I748e8461531a3554d27ebfbf7af33385f69586c0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-19 12:09:52 +02:00
jkobus
5d15076ea1 Fix compilation of generichighlighter test on Windows 
Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 17:25:41 +02:00
Robert Loehning
e29ae8c537 Squish: Fix usages of :OpenDocuments_Widget 
Change-Id: I1dde01e3fc8fb5f696054f72c44bdc9387aad5c6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 16:00:19 +02:00
Robert Loehning
3880b805ae Squish: Fix openDocument() 
This uses the Projects view, not Open Documents

Change-Id: I8695d170ed85939ce2d002270c3cb60d97954130
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 13:13:10 +02:00
Robert Loehning
1abe32996c Squish: Fix getToolTipForViewTab() 
Shortcuts will change when order of modes changes.

Change-Id: I9ee71cefebd4f2404976a7728fd1c4b500efc0f9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 13:12:35 +02:00
Robert Loehning
b0f18491c9 Squish: Added alternative color values to tst_qml_editor 
Change-Id: I00b7df0c33fc6553fe3dc3364c6bc4dc448d72a7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 11:56:22 +02:00
Christian Kandeler
8f7bbb9a08 IoUtils test: Fix qbs project file. 
Apparently, that define is only needed for qmake, if at all.

Change-Id: I12b6768760deddc2a780da105f33857eec6e8710
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-17 18:09:55 +02:00
Christian Kandeler
0392435ddb Autotests: Do not set the QT_USE_FAST_CONCATENATION macro in qbs build. 
The one test for which we included it does not need it anymore,
and the StringUtils test fails to link on Windows when it is present,
so remove it again.

Change-Id: Iebe810c82842047a323f65722a61940271f921f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-16 11:17:21 +02:00
Christian Kandeler
68a966cb2f Fix qbs project files for valgrind autotests. 
They did not build on Windows.

Change-Id: I0c688b8e1b78e9bb06e2efd6e2cbf8791f272bc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-16 11:16:49 +02:00
Nikolai Kosjar
190fb44882 CppTools: Fix qualified ids in the symbol searcher 
The leaves in the treeview contained qualified ids.

Change-Id: I290eaf9b1e666b6879d6d4b1f2483cfe7fb85362
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-09-13 15:41:02 +02:00
Nikolai Kosjar
75b0429e29 CppTools: Locator Tests: Make test data more descriptive 
Change-Id: I23e88c8a04f82d51651038b38faf07057244fede
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-09-13 15:40:55 +02:00
Nikolai Kosjar
91dbac0303 CppTools: Fix qualified ids in the ':' locator filter 
* Always display qualified ids in the ':' filter
* Show correct qualified ids (for some symbols the namespace was shown
  twice)

Task-number: QTCREATORBUG-10136

Change-Id: Id178cb4b8abcc316250fa16e5f3e5a8e72bc0c10
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-09-13 15:40:48 +02:00
Orgad Shaneh
d5a1bdc7fb ANSI: Use QCOMPARE instead of QVERIFY 
Change-Id: Ia1be4cbf9fc4a5e6b608fbf9aad2679a5aa66f38
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-09-12 20:29:30 +02:00
Orgad Shaneh
61eb23082b ANSI: Simplify escape sequence 
Change-Id: I0088a922af7723aabb6751ac80af39467d4cfb0b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-09-12 20:07:40 +02:00
Christian Kandeler
6e11e56290 Make AnsiEscapeCodeHandler autotest compile with qbs. 
Change-Id: I33151bedddf01491a60107f718df8e252ecba301
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-12 18:06:23 +02:00
Robert Loehning
876924d755 Squish: More debugging output for checkDebuggingLibrary() 
Change-Id: Iab745b8982c31a0fc53c7a2b5620816d7b491bea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-12 17:30:31 +02:00
Robert Loehning
7d220425c1 Squish: Avoid unstable values in tst_simple_analyze 
Change-Id: I88869c41f11917ea6031c45403da261b5f017e47
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-12 15:25:13 +02:00
Andre Hartmann
0ff2ed6460 AnsiEscapeCodeHandler: Added auto tests. 
First simple tests to check:
* pass-trough text without ANSI escape sequences
* text-color change in line
* text-bold change in line

Change-Id: I054a3fb218e95dfd5e160f1ae71dc0638bc5f239
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-12 10:31:41 +02:00
Robert Loehning
b044f25c2b Squish: Prevent possible timing issue 
Change-Id: Ia13ae58792c73453b89b8288c5807448f7438c37
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-12 09:30:30 +02:00
Robert Loehning
e93f8edcb8 Squish: More output from tst_simple_analyze 
Change-Id: I8dd924a427a63c5f80f7972a8b13a6ef7d3297d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-11 15:14:23 +02:00
Orgad Shaneh
78930b334b Fix tests compilation 
* CPlusPlusForwardDeclarations.h not found
* Valgrind tests that include botan missing -ldl.
  botan is not required for them (they link just fine without it).

Change-Id: I279b03990ad36d01c93700d50ae8e5119bf5be80
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-09-11 09:02:16 +02:00
Robert Loehning
94274c1f57 Squish: Fine-tuning of tst_git_clone 
Change-Id: I8fdf1e663c2149ec418c2e6760bac151c0d34847
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-10 17:36:13 +02:00
Robert Loehning
62e98bf19f Squish: Remove failing lines for tst_openqt_creator 
Fix is in master, so this won't ever be fixed in 2.8.

Task-number: QTCREATORBUG-10045

Change-Id: I714832f8fbaa39aea6992c31a41e8dd4fe8dfb16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-10 15:30:44 +02:00
Orgad Shaneh
bdf89d1cbd Build valgrind-fake on Windows 
Change-Id: If6252f9a252e9bb0626ec60bdf34fa82cda09bfa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-09 17:41:27 +02:00
Robert Loehning
a22e2caadf Squish: Added further sanity checks to tst_simple_analyze 
Change-Id: I40adc90d4cb73ef4ba3d7c723953d272116e193a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 13:50:01 +02:00
Christian Kandeler
698144e32e Add qbs project files for autotests. 
Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.

Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-09 12:16:09 +02:00
Robert Loehning
fbda0ef558 Squish: Updated tst_simple_analyze after fixes 
Change-Id: I2cc19737d750117780efc57e4047c48f147f08ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 12:15:58 +02:00
Robert Loehning
49adb78ec9 Squish: Fix tst_create_proj_wizard 
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 11:27:31 +02:00
Christian Stenger
fe8d426e10 Squish: Fix killing of left-overs on testing machines 
Change-Id: Ia7bbc5c1eb3d854343717349d8800a3fb14e3e20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-06 15:00:08 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
 2013-09-06 12:20:44 +02:00
Nikolai Kosjar
551b18f304 C++: Tests: Fix tst_Semantic::lambda_2() test 
Change-Id: Ie405a9339d13615efb1113614a7dcd7069849b4f
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-09-06 09:58:02 +02:00