Commit Graph

201 Commits

Author SHA1 Message Date
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Orgad Shaneh
5a5acd664e Tests: Fix MSVC warnings
Change-Id: If7f67ffc68ef725554e9ebaf8a8db5a64b7309cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-13 12:08:13 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2014-12-19 10:18:23 +01:00
Robert Loehning
f44aee5da0 Debugger: Make simple test compile with old Qt and MSVC
Change-Id: Ibef0886f059a4807af9ad0e7922b37835da75efb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-03 10:56:48 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
hjk
22a4f49153 Debugger: Require Qt 5.2 for manual test, too
... by removing fall-back code.

Change-Id: I71f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-17 14:42:34 +02:00
hjk
776da7b5b3 Debugger: Improve associative std container display
Handle multimap and multiset. Use the "[index] key" display that's
also used for Q{Multi,}Map both for consistency and because it's
needed to distiguish otherwise identical keys.

Change-Id: Ib9e369206bce89e5e27d1f6f60ead11ca88e2dcb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-22 10:47:45 +02:00
hjk
a253feee77 Debugger: Fix display of wchar_t[]
Task-number: QTCREATORBUG-12492
Change-Id: I5668c0727a36a1529d28b36d0361922f7acb3083
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-26 14:31:47 +02:00
Erik Verbruggen
a7b882315d Mark unused fields with Q_UNUSED.
.. to suppress -Wunused-private-field warnings.

Change-Id: I9eaea1b45bbe4fda4714831af1926c14b31cb9fe
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-25 15:59:09 +02:00
hjk
d2ad6aa972 Debugger: Simplify array dumper user code
Heads up: This switches the argument order to allow a default
argument for the inner type if it can be determined from the
base pointer.

Change-Id: I9bf80fcdd51b5db8e7c65adba551ca667912cd86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-06 13:50:25 +02:00
hjk
4b4181a9cd Debugger: Handling eigen3 in manual test
Change-Id: Id3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-10 12:19:24 +02:00
hjk
13a4f739ef Debugger: List QObject methods and signals in dumper
This mostly re-activates code from the old code path
in the QObject dumper.

Task-number: QTCREATORBUG-11997

Change-Id: Ie3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-10 10:55:15 +02:00
hjk
161a1eb3ae Debugger: Compile fix in manual test for latest Qt base
The #define COMMA trick doesn't work anymore after the
latest Q_DECLARE_METATYPE changes.

Change-Id: I15cfc7387d8e5329b588d6d841cd9c2322270363
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-07 10:25:17 +02:00
hjk
21ce31a4ef Debugger: Make simple manual test work with android
Change-Id: I33283154214a07a0232b8d52c3da62861956a9a1
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-26 16:29:58 +01:00
hjk
f0d3cce9fd Debugger: Fix warnings in manual test code
Change-Id: I1ee1cc2eb6f93c2e58e1c67d55cf3dfe82fa9f25
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-25 17:56:13 +01:00
hjk
2e7479aef0 Debugger: Add data extraction for dumper inferior call results.
Change-Id: I868be727c48cb3aa570f196dadde71706df01596
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-24 16:46:51 +01:00
hjk
376f58df34 Debugger: Fix QObject/property dumper
Change-Id: Ied68fd07e077a185223a68cc504fff5a5b9391ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-20 17:08:53 +01:00
hjk
580a8c16b9 Debugger: Disable fork test in manual test
Change-Id: I32ec9f9bf5bdb0e9ad93b78bbb2d01dec2759a4b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-15 17:49:13 +01:00
Orgad Shaneh
ca79e4294d Fix compilation
Unused variable

Change-Id: I190d8adf6efba8273ded2288c7232a1e77ef62f9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-08 21:42:51 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Orgad Shaneh
9c2923b05f Fix simple_test_app compilation with Qt < 5.2
Change-Id: I3b903eb790e27e21d7759b989adf1e5077410677
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-19 07:30:51 +01:00
hjk
23d6a1a23e Debugger: Add dumper for QTimeZone
Change-Id: I1b20529d7ecdcbf5480e95d6e7be89a2fdb6a8b7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-16 13:42:03 +01:00
Orgad Shaneh
0be7ab1af2 Fix tests compilation
Change-Id: If8c5f6ca040cdcdee883b91e1909acbd5dfc4922
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-12 10:36:56 +01:00
hjk
242cb17919 Debugger: Adjust QDateTime dumper for Qt 5.2
Change-Id: I53a5701c9d1791e2705eafb258ff440f97e53b87
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-12-02 15:14:42 +01:00
hjk
ee8ddc3564 Debugger: Restrict std::unordered_map manual test to C++11
Change-Id: I13788acb6cfa9a659482d64bead10dd27e71fade
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-27 10:01:54 +01:00
hjk
2d7b0d09ae Debugger: Add manual test for lambda
Change-Id: I288826b0aed94de1f42a9eaddf3d40575e4e13e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-27 09:39:49 +01:00
hjk
fefbc172f2 Debugger: Use thread id, not model row to remember current thread
Task-number: QTCREATORBUG-9207
Change-Id: Ic98fb9a99c250dccf2735f28d0d3fefa7d1da52f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-17 22:55:22 +01:00
hjk
7f6c793f75 Debugger: Fix passing of maximum string length
Change-Id: I96498b93bb1632de8ca960ae24ec54e31f8c0897
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-17 18:28:51 +01:00
hjk
fc52b30450 Debugger: Simplify QVariant{Hash,Map} dumper
Change-Id: I4c5c79f9b2b2d739971d9f50a2b48cfde005e167
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 10:11:17 +02:00
hjk
4f36713716 Debugger: Explicitly handle uint8_t and int8_t
Would be nicer if there was a global way to tell GDB to not produce
"adorned" output...

Task-number: QTCREATORBUG-10344
Change-Id: I5355ebea0570f76415fdacfed34e1311825f57b9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 21:25:36 +02:00
Thiago Macieira
62fb22278c Debugger: Add dumper support for IPv6 in QHostAddress
Change-Id: Ia542cf9e3c695a2c3c4b6340c3d72dfe743339c6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-08-23 21:36:39 +02:00
hjk
e84f7f33a6 Debugger: Disable inapplicable context menu entries for sub-breakpoints
Task-Number: QTCREATORBUG-9984

Change-Id: Id4197b8d0db917606eb0e2767d2b05195e6cfbcd
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-19 12:45:43 +02:00
hjk
e2aa5b53cf Debugger: Add dumper for QIPv6Address and Q_IPV6ADDR
Change-Id: I85d8a484fdc3a265aa736d6a2f38ff955af8e138
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-12 12:41:57 +02:00
Tobias Hunger
c9cafea3c4 Symbian: Remove references to RVCT compiler used on Symbian
Change-Id: I0ebfb74f65ffaf9ea47cc91fa20dd73af62218e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-23 17:03:45 +02:00
hjk
232d7ab8bc Debugger: Split manual QObject dumper test into smaller chunks
Easier to track down issues if they are more isolated...

Change-Id: I89d7e5f474c08075196f9e0f2bde471fb093c7e4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-17 14:11:32 +02:00
Orgad Shaneh
05ef32f242 Remove Nokia leftovers
Mostly internal mimetypes

Change-Id: Ia84206f1334c1f83474cbc307e848719bb98adbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:23 +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
21da8c641d Debugger: Add dumper test for inheritance edge cases
Change-Id: Ia4db7dfc0a0182126255393730d15d12abaf369b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-05 14:29:43 +02:00
Orgad Shaneh
6dc975a8ad Tests: Fix MSVC errors and warnings
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:14:24 +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
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
Robert Loehning
3898effa68 debugger: compile fix for MSVC in self test
Change-Id: I44304538e18775833a995a50d6b696d666083baa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 14:03:16 +01:00
Robert Loehning
ef3647ad43 debugger: Updated self test
Change-Id: Id9eeb62ff336843ce196dfebc771f03ae22d3cbc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-22 17:49:58 +01:00
Robert Loehning
9741e70f30 debugger: Fixed checks for file classes in self test
Change-Id: I5bfe1047ad3b6fc6bd7080c15e6908a47e5ae5a8
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-15 19:30:54 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Robert Loehning
7c9c1924f0 debugger: compile fix in self test
MSVC does not support #warning

Change-Id: Ie9f9575a53c4c124e2ecffc6ad55181f2049ec5f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-21 08:31:29 +01:00
hjk
c3ce444c8e debugger: add dumper for QStringRef
Change-Id: I6a3b732de5b2741ba2f19f012dd59373ce94377c
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-18 00:21:09 +01:00
hjk
9a204ebe7a debugger: don't show large uint64_t as negative values
Task-number: QTCREATORBUG-8215
Change-Id: I1b7ef66f82b69c55d4a9778ad9ac79437d00022a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 11:43:12 +01:00