• Eike Ziller's avatar
    Merge commit '3c850586' · 9926fc2a
    Eike Ziller authored
    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
    9926fc2a
cppfindreferences.cpp 25.3 KB