Commit Graph

9 Commits

Author SHA1 Message Date
Friedemann Kleint
143af2845d Fix excessive warnings by MSVC 2013 64bit about size_t->int truncation
C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data

Change-Id: I91979c685bbbd84359f7f4e19911a21a408f5d23
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-20 14:27:51 +00:00
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
Christian Kandeler
cf21092ec5 Analyzer: Use QKeySequence::copy for copying to clipboard.
Change-Id: I238eace2198e5a2329ce7db559e4df354e84cb80
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-12 12:08:16 +00:00
Christian Kandeler
d9408156d1 Analyzer: Put more common code into the DetailedError* base classes.
Namely:
    - The "copy" action and the corresponding "slot".
    - The context menu.
Plus an infrastructure for adding new common and custom actions.

Change-Id: I4bf8b28b4ad60b4022abbfc0b401c3b832b94560
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-12 10:23:45 +00: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
Nikolai Kosjar
3f7db88ffd AnalyzerBase: Return base sizeHint() for invalid indices
DetailedErrorDelegate::sizeHint() calls createDetailsWidget() even for
invalid indices, which does not make any sense.

With this change the following messages will not be displayed anymore
when switching to the the Clang Static Analyzer:

    QWidget::setMinimumSize: (/QWidget) Negative sizes (636,-1) are not possible
    QWidget::setMaximumSize: (/QWidget) Negative sizes (636,-1) are not possible

Task-number: QCE-28
Change-Id: I7d45b2625ad94ddccfbb2c22ff5c07ee0bdd1256
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-26 09:17:38 +01:00
Nikolai Kosjar
65e9da282f AnalyzerBase: Fix opening links with Windows drive letters
Change-Id: Iba365f9abeff2573296295e50a6100cc480374b4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 11:58:31 +02:00
Nikolai Kosjar
ae087f0557 AnalyzerBase: Accept links with column number in DetailedErrorView
Change-Id: I61ff15877523325a80cdfa089bd28e4e89a45bd5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 16:13:51 +02:00
Nikolai Kosjar
24bde997ca AnalyzerBase: Extract some base classes from Valgrind
This makes the view of the valgrind tools avilable for other analyzers.

Change-Id: Icb28a3a6d6dbd7d437de803d50e30fada7dca0da
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 16:13:47 +02:00