feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
33,465 Commits 108 Branches 368 Tags
dbb23c7fbc9b3dd7291907a7a8655f5bb2132c3b
Commit Graph

33465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orgad Shaneh dbb23c7fbc CppEditor: Remove unused member from VirtualFunctionHelper 
Change-Id: Icc73522fe108685aa09de37172a61dfa8d16ea9b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-28 19:17:41 +01:00
Orgad Shaneh 1154a8c6c2 TextEditor: Add an explicit include for QScopedPointer in CodeAssistant 
+ Sort the includes

Change-Id: Ia6a5afdaa42c24c9ec0f66748aec1b6224561ab7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:47:08 +01:00
Orgad Shaneh 90265b7696 CppTools: Fix indentation for some completion tests 
Change-Id: I9a5bf4705da5ca88776dec70057da2c64e4c1494
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:46:59 +01:00
Orgad Shaneh 0909c0295f CppTools: Make completion tests data-driven 
Mostly done using the following Ruby script:

Fname = 'src/plugins/cpptools/cppcompletion_test.cpp'
s = File.read(Fname)
mod = s.gsub(/(?<declaration>void CppToolsPlugin::test_(?<test_name>[^(]+)\(\)\n\{)(?<body>.*?\n)\}/m) { |func|
  match = $~
  declaration = match['declaration']
  body = match['body']
  test_name = match['test_name'].sub('_data', '')
  final = body.gsub(/(?:completions.clear\(\);\s+)?(?: +)[^\n]* =\n(?<code>.*?);\s*(?<completions>(?:completions.append\(QLatin1String\("[^"]*"\)\);\s*)*)QTest::newRow\("case: (?<name>.+?)"\)\s*<< code << _\("(?<prefix>[^"]+)"\) << completions;/m) {
    m = $~
    res = "    QTest::newRow(\"#{test_name}: #{m['name']}\") << _(\n#{m['code'].rstrip}\n        ) << _(\"#{m['prefix']}\") << (QStringList()"
    m['completions'].scan(/completions.append\((.+)\);/) { |comp|
      res << "\n            << #{comp[0]}"
    }
    res + ');'
  }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?, "(?<prefix>.+?)"\);\s*QStringList expected;\s*(?<completions>(?:expected.append\(QLatin1String\("[^"]*"\)\);\s*)*)const QStringList completions = test.getCompletions\(\);\s*QCOMPARE\(completions, expected\);/m) {
    m = $~
    res = "    QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n        ) << _(\"#{m['prefix']}\") << (QStringList()"
    m['completions'].scan(/expected.append\((.+)\);/) { |comp|
      res << "\n            << #{comp[0]}"
    }
    res + ');'
  }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?(?:, (?<prefix>".+?"))?\);\s*(?:const )?QStringList completions = test.getCompletions\(\);\s*QCOMPARE\(completions.size\(\), \d+\);(?<completions>(?:\s*QVERIFY\(completions.contains\([^\n]+\);)*)\n/m) { |mm|
    m = $~
    res = "    QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n        ) << _(#{m['prefix']}) << (QStringList()"
    m['completions'].scan(/QVERIFY\(completions.contains\((.+?)\)\);/) { |comp|
      res << "\n            << #{comp[0]}"
    }
    res + ");\n"
  }.gsub(/(?: +)[^\n]* =\n(?<code>.*?);\n\s*CompletionTestCase test\(.+?(?:, (?<prefix>".+?"))?\);\s*bool replaceAccessOperator = false;\s*const QStringList completions = test.getCompletions\(\&replaceAccessOperator\);\s*QCOMPARE\(completions.size\(\), \d+\);(?<completions>(?:\s*QVERIFY\(completions.contains\([^\n]+\);)*)\s*QVERIFY\((?<replace>!?)[^)]*\);\n/m) { |mm|
    m = $~
    res = "    QTest::newRow(\"#{test_name}\") << _(\n#{m['code'].rstrip}\n        ) << _(#{m['prefix']}) << (QStringList()"
    m['completions'].scan(/QVERIFY\(completions.contains\((.+?)\)\);/) { |comp|
      res << "\n            << #{comp[0]}"
    }
    res + ")\n        << #{m['replace'].empty?};\n"
  }
  if final == body or final['QTest::addColumn']
    declaration + final + "}"
  else
    final
  end
}.gsub(/QTest::newRow\("([^"]+)"/) { |m|
  name = $1
  if name.size > 73
    space = name[0..73].rindex(/[ _]/)
    "QTest::newRow(\"#{name[0..space]}\"\n                  \"#{name[space+1..-1]}\""
  else
    m
  end
}.gsub(/\s+QTest::newRow/, "\n\n    QTest::newRow")
if mod != s
    File.open(Fname, 'wt').write(mod)
end

Change-Id: Id6bfb03cdf31ac27b36028fcdc861c340a5398f4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:46:49 +01:00
Orgad Shaneh ed2d98577a CppTools: Reorder completion tests 
For reasonable diff on following commit

Change-Id: I97e121355279f9166cea2f500cf2d4df5fafaa32
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:41:52 +01:00
Orgad Shaneh f53598a1ae CppTools: Braces cleanup in CppCompletionAssistant 
Change-Id: I3dea8a8bdd4ae71b48926ec3332ef00cf5ad4303
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:41:35 +01:00
Orgad Shaneh be31d8d08f CppTools: Minor optimization in CppCompletionAssistant 
Change-Id: Ieb452713e9e09fce107520c4fd2a401007802e89
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:41:26 +01:00
Orgad Shaneh b0c3a6bad8 CppTools: Generalize data-driven test_completion 
Change-Id: I409a00b869a95dff2d69c9744da75c324c82776a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:25:51 +01:00
Orgad Shaneh 0204f56628 CppTools: Cleanup completion tests #2 
Change-Id: I3c5f42de464a5607f1caa6a48d881c5a4a113ec3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 13:20:27 +01:00
Orgad Shaneh 7356987c41 CppTools: Remove superfluous comments from completion tests 
Change-Id: I2526daeaf54f7f8d4b808cf556cff9242adaa391
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 12:51:38 +01:00
Orgad Shaneh 5713b85cb0 CppTools: Refix MSVC compilation 
SemanticInfo has moved from CppEditor to CppTools and is now exported,
so this workaround is no longer needed (and it breaks linkage)

Change-Id: Ic9ba017bcb06be85fdccef27e63091415494bb21
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 12:00:34 +01:00
Orgad Shaneh d3c606c001 CppTools: Fix MSVC compilation 
Change-Id: I7b3c52a6eb70a0e2d7f2785fac71cb3ac68769d8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-12-23 09:25:02 +01:00
Orgad Shaneh c17f798a01 Git: Do not invoke git for details about empty change 
Change-Id: I2a7b36063ad3c67d3a1fbe999659dc0051723b10
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-23 06:45:21 +01:00
Orgad Shaneh ddfec003ad Revert "Git: add completion to ChangeSelectionDialog" 
Missing dependency

This reverts commit 724690132cf6d8fb812ea67e1665d7bbf7c5d290

Change-Id: Ib20b7bbd23b0a22e271006f951095d805e4639e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-22 08:47:06 +01:00
Orgad Shaneh 1f4587955d Git: add completion to ChangeSelectionDialog 
Change-Id: I0b693ec00008b9cd39e05148acc5441fed39a196
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-22 08:46:42 +01:00
hjk 05f47cd451 Debugger: Make also individual formats persistent 
I am not fully convinced this is a good idea, but it looks like
the different behaviour of type formats and individual formats
is unexpected.

Task-number: QTCREATORBUG-7412
Change-Id: I5aae39939dfe75b3d9ff6c1025bd3d9c9222695a
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-12-20 19:09:51 +01:00
Erik Verbruggen 5beb74fd9d Add experimental clang code-model plug-in. 
Previously known as the wip/clang branch.

Contributors (in alphabetical order):
- Christian Kamm <christian.d.kamm@nokia.com>
- Erik Verbruggen <erik.verbruggen@digia.com>
- Leandro Melo <leandro.melo@nokia.com>
- Peter Kuemmel <syntheticpp@gmx.net>
- Sergey Shambir <sergey.shambir.auto@gmail.com>

Change-Id: I4c3ff600a19b6732641c1d5ef28236bf2cc17737
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-20 17:05:09 +01:00
hjk 93b7528431 Rename pluginjsonmetadata.xsl -> qtcreatorplugin2json.xsl 
The original name inconveniently starts with 'plugin', creating a
conflict for shell tab completion when trying to enter src/plugins/...
taking extra keystrokes to resolve.

Change-Id: I7fa59d767aa900f73cd643dfab0d5b2131652a2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-12-20 12:41:09 +01:00
Tobias Nätterlund 4dd2b819df QNX: Show line/column in the bar descriptor editor 
Task-number: QTCREATORBUG-10395

Change-Id: I290c52dbcf2615513ec1a5fb0e724baff425d1cf
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-12-20 07:36:06 +01:00
Thiago Macieira f73cd8b6db Add AVX types __m256, __m256d and __m256i to the dumpers 
Change-Id: I16126091c8c3a241d0b91534ecdb5f0cbf7d5bd5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-19 23:02:09 +01:00
Thiago Macieira 346733d8a1 Split __m128d (double) from __m128 (float) SSE types 
This also removes the display type selection, which didn't work
anyway. __m128 were only displayed as floats.

Change-Id: I2e3df0cd87a21abb0e3d844384e18cb9e5e6a021
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-19 23:00:57 +01:00
Thiago Macieira b076618aa9 Add support for __m128i types in the debugging dumpers 
I can't make it display the unsigned char[16] as a string and I have
no clue why. This is all magic to me...

This is good enough anyway

Change-Id: I1d78c01b3baaec8e7d4506552d79a536b573e9a6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-19 22:59:10 +01:00
jkobus 0d13028440 Refactor source property 
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.

Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-19 14:06:51 +01:00
Eike Ziller cc1e8464d1 Qmake/AddLibrary: Remove unneeded indirection over widget 
Change-Id: Ifc949a520054228d882ae1ff8ddbb7de87977abc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-12-19 11:36:28 +01:00
Eike Ziller 0279661122 VCS: Remove unnecessary indirection 
Change-Id: I73d70da7e6cc6006da92c05bf0b15da6b8bbf5bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-19 10:37:55 +01:00
Eike Ziller 8cad383b80 Merge remote-tracking branch 'origin/3.0' 2013-12-18 15:10:58 +01:00
Eike Ziller 9b9d339c10 Hardcode search terms for designer options page 
By taking the translated text from designer.
This way we don't freeze directly when filtering the options page. We
still have to initialize designer (and therefore freeze) the moment that
category gets selected though (which can also happen during filtering).

Task-number: QTCREATORBUG-9584
Change-Id: I88275db97f87a5da8c565bccc8ae41de3b51a135
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-12-18 13:27:27 +01:00
Eike Ziller 83a3705912 Fix build with Qt4 
Change-Id: I1ef1f20d776f955c2f08d551dbac1621b98c0961
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-12-18 12:51:43 +01:00
Robert Loehning a0fdad9921 Squish: Added further git log tests 
Change-Id: I28a1922fa1cf256baf3775d6eab47aeeb35432df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-18 12:32:24 +01:00
Eike Ziller 8178f709c2 QmlJsEditor: remove empty function 
Change-Id: Ifc694394ebde336de0b7d1492dedf840c9e9a8dd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-12-18 11:37:37 +01:00
Eike Ziller 025446b02b Move document -> code assist connect to CodeAssistant::configure 
Change-Id: I6124c12a269093fbd54cbbbb47b4d7f15ffaae2f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-18 11:37:27 +01:00
Eike Ziller 1adab4c4cc Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument() 
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-18 11:34:34 +01:00
Eike Ziller e035ae6df1 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
 2013-12-18 11:02:16 +01:00
Martin Bohacek fca56658bb Debugger: general underlying container dumper for std::stack 
Change-Id: Ic55bdf7b2974aaa7a0b26ac7509288cafc2d5fa9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Martin Boháček <mbohacek@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-18 10:26:03 +01:00
Petar Perisin 3479b4a07b ProjectExplorer: Fix task visibility 
Change-Id: I283c3704b834cfb3d62f3e12a76c5530ee85d777
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-17 16:55:47 +01:00
Jens Bache-Wiig 1193cfa092 Cache loaded items 
This is a somewhat different solution for improving the
performance of the welcome screen. It has the added benefit
of caching loaded items while still retaining a decent
performance.

Change-Id: I9927a90f1b7de5bb06c43b16dc80cb2afec3f8ad
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-17 16:23:35 +01:00
El Mehdi Fekari 5ad99eb22a Qnx: Add missing title in the last setup wizard page 
Change-Id: Iba0865d5762083d25532a92047ab95188bfd0487
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
 2013-12-17 15:56:01 +01:00
Eskil Abrahamsen Blomfeldt 4b40cda342 Android: Fix build path with non-latin characters 
androiddeployqt uses toLocal8Bit() to get the correct
encoding for executing shell commands, which is broken when
Creator sets the process locale to something different from
the shell. This caused build failures for all users on systems
where the default build path is translated to something which
contains non-latin characters.

Task-number: QTBUG-34316
Change-Id: I4e7dd0d3351d164b720f042bb21f668589df5527
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-12-17 15:09:49 +01:00
El Mehdi Fekari 23fe4092f4 Qnx: Set missing parents for QMessageBox dialogs 
Change-Id: Id279e8d7cf4ddc2a25aeab509ac48af53bdbc7a0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-17 14:42:47 +01:00
Eike Ziller 74cc163a06 LLDB: Fix display of bases with multiple inheritance. 
It was only showing the "last" one because the inames were the same
(currentIName.None).
Do not overwrite iname of sub item in 'enterSubItem' if it already was
set.

Task-number: QTCREATORBUG-11109
Change-Id: I74581f62d47ff0c33650769c3ed66e24124d1092
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-17 13:56:12 +01:00
Leena Miettinen 859c116693 Doc: change "NDK" to "API Level" in BlackBerry 10 topic 
The field label was changed by: f10afe69a5

Change-Id: Iaac787c84459fcabb0399012201999c60671d563
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-12-17 13:40:57 +01:00
Kai Koehne 27563451cb Allow plugins to depend on plugins outside of creator source tree 
Do try to resolve plugin_dependencies.pri files in all directories
set by QTC_PLUGIN_DIRS. Also fail if a dependencies_pri file cannot
be resolved.

Change-Id: I2c14db832cef0fcc97a2f0351847c4969f5bd420
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-12-17 08:54:03 +01:00
Thiago Macieira 9dd60b34f8 Fix use of variable before initialization 
That's what you get for shadowing a variable... The "childItem" variable
on the second part of the foreach refers to one declared on the first
part, which is uninitialized.

Found by ICC 14.0:
graphicalnodeinstance.cpp(300): warning #592: variable "childItem" is used before its value is set

Change-Id: I9079a428eda90f4bb06f9ccd1adf836fee119133
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-12-16 21:47:21 +01:00
Friedemann Kleint e1446da00d QmlDesigner: Avoid value-list creation when iterating over maps. 
Change-Id: I945344f671515fc8a8104063e95fdac546f5635b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-12-16 16:41:55 +01:00
Fawzi Mohamed 293d4d9a6d ios: correcly update executable path in the ui 
changing the build directory did not update the path shown in the
run configuration ui (but the correct one would be used)

Task-number: QTCREATORBUG-11080
Change-Id: I4105cb6ffd21bffe59e9bbbccdf427caf88646d6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-16 16:31:05 +01:00
Fawzi Mohamed b1e871e9b0 projectexplorer: fix target buildDirectoryChanged signal 
Change-Id: Ie46371cac2d345411247c1d2035ee2d5f3b8c00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-16 16:30:51 +01:00
Friedemann Kleint dc6b28366c Avoid value-list creation when iterating over maps. 
Change-Id: I704ba93d01ffababb405bc801f07a845631930cc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-12-16 16:03:16 +01:00
hjk 869c46a02b Debugger: Fix display of multiple inheritance from std::list 
Task-number: QTCREATORBUG-11023

Change-Id: Ia195ff84f7928615b0df5732c6f1a1cd8b401001
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-16 15:40:21 +01:00
Friedemann Kleint 6c56a065d9 qmlpuppet: Fix compilation with Qt 4. 
Change-Id: I9d6b4044fb4ad59c8fd15e878cc377ca838dfb01
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-12-16 15:22:37 +01:00
Marco Bubke 601e090efd QmlDesigner: Fix item selection 
Painted bounding rectangle was used for selection.

Task-number: QTCREATORBUG-11066
Change-Id: I267b7cc4bb563efcb8d351ba980a4899d64c53a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-12-16 15:14:37 +01:00