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
Tobias Hunger
01699e9f25
JsonWizard: Allow for wizards without generators
...
The Checkout wizard will not feature any generator.
Change-Id: I05900309a5ea8a638493ab0fa5499759bcdc181f
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2015-01-21 12:11:18 +01:00
Tobias Hunger
21f272a8c7
JsonWizard: WS only change
...
Change-Id: I6f5fd3818d51ee531b92be0b78b4435d621fe0ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com >
2015-01-21 09:27:34 +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
Robert Loehning
18aa49e7c2
String improvements
...
Change-Id: I45778c9562ba530a36ddaf201f0c61d380d701cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com >
2015-01-06 11:50:19 +01:00
Eike Ziller
225e599c94
Register wizard windows so they appear in window list and get shortcuts
...
Change-Id: I69b3a49ba2e2162585502a523be835918b7b9533
Task-number: QTCREATORBUG-13766
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com >
2015-01-05 16:04:52 +01:00
Tobias Hunger
b9d2fd8eac
JsonWizard: Allow enableing/disableing of pages from the Json file
...
Change-Id: Ic21f0f176f2a82577eaf4a72fbb01c011e1ada2b
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-11-03 09:42:07 +01:00
hjk
a439483d70
Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible
...
Faster.
Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com >
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-11-03 09:31:28 +01:00
Tobias Hunger
4c737d7157
JsonWizard: Small improvement to error message
...
Change-Id: I54368d8f7ceba1e43b0834f106edf16e065ad32d
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-10-30 16:46:44 +01:00
Eike Ziller
9c7019f0b2
License update.
...
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-15 15:19:55 +02:00
Tobias Hunger
f51fcacacb
JsonWizard: Add File- and Summary pages
...
These reuse the existing pages we use for other wizards.
Change-Id: Ic505204e0988a6b44d112da35748f81d9f8e2c1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-09-30 10:56:17 +02:00
Ulf Hermann
544783cf2a
ProjectExplorer: Avoid static initialization fiasko
...
The search paths can only be constructed once the extension system is
ready. This may never happen if the plugin is loaded directly, e.g.
from an autotest.
Change-Id: Ibfcb7bbb6138480d772d5097aaa8b0ae44d1b043
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-09-29 14:58:43 +02:00
Tobias Hunger
3491b1f22a
Add JsonWizard
...
This is a generalization of the customwizard (using Json for its
configuration files since that is so easy to handle in Qt 5 and
since it is incompatible with the customwizard anyway).
It allows to define an arbitrary number of pages and generators to
generate the actual files.
Change-Id: I45a01cf7fb906701b627fa1471a898cad472f679
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
2014-09-19 16:54:50 +02:00
