feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,904 Commits 108 Branches 368 Tags
0088aec7bd4ece1aadfc17b0fa21167a9f37a43d
Commit Graph

2998 Commits

Author SHA1 Message Date
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
hjk
f863fa6044 Debugger: Show Qt version and dumper dir in failed autotests 
Change-Id: I7520278266717e854dbb136a140381791f483c0c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-22 09:23:37 +02:00
Robert Loehning
f7ac7fb241 Squish: Updated createNewQmlExtension() 
Change-Id: I4739794a78fee1c347e2b63f46883f161140d360
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:45 +02:00
Robert Loehning
e5d6decccc Squish: Updated hook_utils 
Change-Id: I7d2f43a9283f5b8a3edff4888a6b8c3eac076038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:36 +02:00
hjk
51593a1229 Debugger: Make dumper tests startable with LLDB 
Change-Id: Iaf6cf18c47b21cf196b641c44fc2475d4f382ba2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-16 17:50:30 +02:00
hjk
dbae389029 Debugger: Use different environment variable to override in test 
Makes debugging debugger tests easier.

Change-Id: I394862dabfd4f3577b01045b94419b4028ca15ba
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-16 15:11:13 +02:00
Christian Stenger
ee9ec5a4d0 Squish: Correct shebang locations 
Change-Id: I5af2abaff10dc4095d6cf35350068ca08742b6ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-16 09:24:07 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Erik Verbruggen
aa3aa7c455 C++: Fix unused field warnings in test. 
Change-Id: I898668a91eb7d3fa18c0a8d3e7e7507f0fb5a917
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-15 12:35:59 +02:00
Robert Loehning
bbee7310c1 Squish: Remove workaround 
Change-Id: I8c42ae2d67a2eac292c4c1ca4de75ec59b060ec3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 12:22:20 +02:00
hjk
4ec7c2ea6e Debugger: Start using the LLDB script approach in auto test 
Currently non-functional on Linux as break-on-function + up crashes LLDB

Change-Id: Id573dc2ace319d986493dbc637fb73092ed26284
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-15 10:23:33 +02:00
hjk
2da28cea46 Debugger: Remove plugin dependency from dumper autotest 
Change-Id: Id6d3cf6299af53cbf6910f545dee3820e90a7746
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-15 10:23:08 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7' 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
 2013-05-15 10:21:47 +02:00
Robert Loehning
3cafcba19a Squish: Updated progressBarWait() 
Change-Id: I81381dba6b0653a550a7362743939e7b943a9f00
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 10:12:02 +02:00
Christian Stenger
8ca5b55a0b Squish: Prepare re-usage of batch editing... 
...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-15 08:59:16 +02:00
hjk
3d183d95f7 Debugger: Make some helper header stand-alone 
Include <QtGlobal> to get access to QT_VERSION.

Change-Id: Id1e6b108e9b2e98015c434796bef37262e4da126
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-14 18:19:44 +02:00
hjk
e2d7fbc1c8 Debugger: Fix autotests 
Change-Id: I8eda5a5c4db7f198a51cb09293abedd1edcfb664
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-14 12:37:51 +02:00
hjk
9d1de91db7 Debugger: Make manual test more flexible for SSE types 
Change-Id: I12346d0aa29d7ad7e3c54ff6ba5e2d405c1fdaa8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-14 12:37:40 +02:00
hjk
1e187f177a Debugger: Fix auto test build breakage 
Change-Id: I836ba236d96725865d16bcb6f998846e685eb4bf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-08 09:04:55 +02:00
Robert Loehning
4255ec2df6 Squish: Corrected verifyBuildAndRun() 
...to deal with the behavior described in QTCREATORBUG-9212

Change-Id: Ic69098be5a09fe6aa85c40218483c2d679584ab3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-07 18:36:32 +02:00
hjk
fa2ac44271 Debugger: Add a convenience function GdbMi::toInt() 
Saves some line noise on the user side.

Change-Id: I9c6d7542195fc7485ac4ee466cd42a28be95b8da
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-07 13:24:48 +02:00
hjk
9b8b8ba97b Debugger: Replace GdbMi::findChild() with an operator[] 
Less noise.

Change-Id: I8e533c97207ff5b9c79182c4fb99993f1992154f
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-06 14:41:08 +02:00
Christian Stenger
edf8b4a59b Squish: Stabilize invoking context menu items on Mac 
Change-Id: I64ed356b6120c38d51c646ae409bbbc3a4fe9e8e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:46:18 +02:00
Christian Stenger
e0b7cd6b03 Squish: Added timeout for waitFor() 
Change-Id: I9d15d03c9b289f41830a57ed659264a324338cc6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:35:30 +02:00
Christian Stenger
cc765472d2 Squish: Use readFile() if possible 
Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:35:20 +02:00
Erik Verbruggen
8e18adc70f C++: Fix crash in code completion. 
Caused by a dangling pointer of a template instantiation which had been
cloned into the wrong control. The fix is to remove that control and
refer to the control of the bindings (which is the correct one).

Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-03 10:56:26 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
 2013-05-03 09:49:28 +02:00
Przemyslaw Gorszkowski
d14767a6af C++: fix highlighting type when there is using Namespace::Class 
If type is not found we try to find 'using' declaration for this type.

Task-number: QTCREATORBUG-7903

Change-Id: I569db9e1a8504a5da3115ebbed2e823d5924f6ca
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-02 15:17:27 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal() 
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-02 10:13:19 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Francois Ferrand
4d18710f46 C++: fix handling of empty va_args macro arguments. 
Preprocessor did not correctly handle when variadic macro arguments were not
provided at all, if there were other arguments: macro was not expanded
in case only the non variadic arguments were given.

 #define MACRO(...)       used to work fine for 0 or more arguments.
 #define MACRO(ARG0, ...) used to work only for 2 or more arguments, now fixed.

Change-Id: I64e9199ceccae05618a49931c2adad8e4f9471ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-29 10:09:43 +02:00
Christian Stenger
f3056f04b2 Squish: Fix script for multiline strings 
If object names are scattered across multiple lines the
script failed to get the whole object name and failed therefore.
This patch corrects this behavior.

Change-Id: Ia97e2577162b77ae1b72fdd51dda4c74c59abe25
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-26 09:10:51 +02:00
Robert Loehning
e793779589 Squish: Added test for renaming files 
Task-number: QTCREATORBUG-8335
Change-Id: Ie9ca9018194c955f099b7d99ab46ba26303e354d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-25 16:12:46 +02:00
Christian Stenger
d799bf31be Squish: Changed handling of workarounds 
If a bug is closed for master but still valid for the current working
branch the workaround won't be executed if started with
performWorkaroundIfStillOpen(). This leads to wrong results.
The new approach is less automatic but more error-proof.

Change-Id: If33c920be08e33c0fb2ccc4faec4ae8ff0d0f95d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-25 12:39:50 +02:00
Christian Stenger
ba6cc1d04f Squish: Cleanup workarounds.py 
Change-Id: Ibbdae1c85d49122928fda97ea5f3d83245eab7ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-24 13:20:41 +02:00
Christian Stenger
eab228dcca Squish: Cleanup workarounds.py 
* removed fetching status
* improved output for closed bugs

Change-Id: Ice0256f75571c6c44e9878447d3821247f5ded4f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 17:04:07 +02:00
Christian Stenger
59edc40593 Squish: Add Run button to objects.map 
Change-Id: I506a030714a46a1ca3610b18daf296deaa6bfcc2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:37 +02:00
Christian Stenger
c4aad3ef79 Squish: Cleanup tst_simple_debug 
Change-Id: Ie74b0dd42d14e594e436408e39db20554904b84e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:28 +02:00
Christian Stenger
1f5b3ed670 Squish: Cleanup tst_simple_analyze 
* workingDir should not be global
* handle missing Qt Creator plugins on startup

Change-Id: Ibb8267da9d3443104f6d895ff98b6047f693284e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:16 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
 2013-04-23 11:13:25 +02:00
Christian Stenger
a50f4073c8 Squish: Improved QmlProfiler test 
Change-Id: I2ad50fac22a02de79643eb4d8a06c8736bb8539c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-22 14:12:16 +02:00
Eike Ziller
37cd957a94 Now really fix the treeviewfind test for 2.7 
Change-Id: Ia3d1fa31bb8045ecb7638c5dfe800bb57f449cfa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-19 12:50:41 +02:00
Przemyslaw Gorszkowski
080bf4ecb8 C++: improve support for anonymous classes 
Fix:
* highlighting
* find usages
* follow symbol
* code completion

Task-number: QTCREATORBUG-6497
Task-number: QTCREATORBUG-8963
Task-number: QTCREATORBUG-3610
Task-number: QTCREATORBUG-7579

Change-Id: I3dcaf1c515d0199c3e6bee72284fbb40064686ee
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-19 12:14:56 +02:00
Eike Ziller
87284f7df8 Revert "Revert "Fix building treeviewfind test."" 
Reverts the revert that was needed for 2.7.
This reverts commit 3110c28cc1.

Change-Id: If7f4d22f3d339842e6a5846e2edb99e2c961a794
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-19 09:06:39 +02:00
Eike Ziller
26cf7be1c3 Merge remote-tracking branch 'origin/2.7' 2013-04-19 09:05:42 +02:00
Eike Ziller
3110c28cc1 Revert "Fix building treeviewfind test." 
That shouldn't have gone into 2.7...
This reverts commit 4647cb77d3.

Change-Id: I4abfc8120d7c3d5a6b9e11d212f955cd66ba01a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-19 09:02:51 +02:00
Erik Verbruggen
63a04e0c15 C++: replace Q_UNREACHABLE by QTest::qFail. 
Q_UNREACHABLE was introduced in Qt5, so using it impossible to compile
the tests with Qt4.

Change-Id: I0ed23ad9390b1428513a7a0c975dd8fb72efb001
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-18 15:50:00 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD 
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
 2013-04-18 12:54:37 +02:00
Eike Ziller
4647cb77d3 Fix building treeviewfind test. 
Change-Id: If4211acb37cb3c87a901ebf3da030bd1da3cf99c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-18 12:50:59 +02:00
Erik Verbruggen
4b0f70f4c9 C++: highlighter clean-ups 
- Moved TextEditor::SemanticHighlighter::Result to
  TextEditor::HighlightingResult
- Moved SemanticInfo::UseKind to CppHighlightingSupport::Kind

Change-Id: I14faab1891ca691a0691cfd9243edf19fcd3d3df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-18 12:25:24 +02:00