summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlProjectManager: Qt Quick UI templates via json wizardAlessandro Portale2015-05-181-120/+0
| | | | | | | | | | Using the new .json wizard engine allows us to get rid of much old custom wizard logic. As additional benefit for the end user of Qt Creator, the .qml.ui split is now optional. Change-Id: Ic6d35e650cf0a7735cdfac9080f95015309a5879 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Remove unneeded qualificationsOrgad Shaneh2015-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I492792bb9e5655c55795e938031efc557c9a462f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Port to new connect apiMontel Laurent2015-01-301-2/+2
|/ | | | | Change-Id: I873a36601d54065b61d0666558b93dc839ad0dfc Reviewed-by: hjk <hjk@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Set general qml and qtquick features for wizardsjkobus2014-08-121-0/+3
| | | | | | | Task-number: QTCREATORBUG-12469 Task-number: QTCREATORBUG-12760 Change-Id: I6c068fadc418d2973bda12f877121d30fbba449c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* BaseFileWizard: Get rid of applyExtensionPageShortTitle(...)Tobias Hunger2014-06-121-3/+2
| | | | | | | | | | | | | That method was used to set a title in the progress view of the wizard that is different from the page title. That is used exactly once and there it adds more confusion than it helps. So get rid of the whole thing. Consistently set the "shortTitle" property instead for all wizards that want to have a separate short title. Change-Id: Ia4881e9c00891058629491f9e9de4ac421c59727 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Introduce BaseFileWizardTobias Hunger2014-06-061-1/+1
| | | | | | | | | Introduce BaseFileWizard and derive all File Wizards from that. Change BaseFileWizardFactory::create(...) to return a BaseFileWizard. Change-Id: Ic0cb9e9d0390045dab57cd1a75a0f839c1f90216 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* BaseFileWizardFactory: rename createWizardDialog method to createTobias Hunger2014-06-061-6/+5
| | | | | | | | Unify name of parameters object that gets passed into the method while at it anyway. Change-Id: I9cfdfe3b7dcdbd5e083b3b91922053be3a63b081 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge multi Qt Quick UI wizards into onejkobus2013-11-061-44/+17
| | | | | Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-291-2/+2
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-161-2/+2
| | | | | | Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-161-3/+3
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Cleanup IWizard interface and usershjk2013-09-241-28/+21
| | | | | | | Added 639 lines, removed 1391. Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kill ";;" at end of statementNikolai Kosjar2013-09-041-1/+1
| | | | | Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtQuick Ui Wizard: Create right runconfigurations for Qt Quick 2 uiDaniel Teske2013-07-021-17/+0
| | | | | | | | | | The wizard doesn't need to write a .user file, the code in fromMap handles that case. Task-number: QTCREATORBUG-9678 Change-Id: Iea308fb8afd1248b8bf15d5825ba94b95b4916a0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Wizards: getting rid of pointless empty lineThomas Hartmann2013-06-181-1/+3
| | | | | | | | An imagte with invalid path creates a poinless empty line. Check first if image does exist. Change-Id: Icaaafc26c81756a076683eff42ce6c9e72185f0b Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Clean headers in QmlProjectManager.Friedemann Kleint2013-04-091-12/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I2d1d2ec5a3071de9d2a0a03bc69ec653becc7f85 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProjectMamanger: ui fixes for QmlApplicationWizardThomas Hartmann2013-02-041-0/+4
| | | | | | | | | | Adding Proper title and description. Setting project name as uniqueProjectName() (untitled) Task-number: QTCREATORBUG-8679 Task-number: QTCREATORBUG-8680 Change-Id: I29227dc45cc3584f5a57642d936cac5a458535af Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Features: Use Core::Id as basehjk2013-01-151-6/+5
| | | | | Change-Id: Iab812778f8f924638224ec343cadac70e8854e4f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlProjectPlugin: replacing QmlProjectApplicationWizardThomas Hartmann2013-01-111-0/+176
The new wizard is template based. This allows easy addition of custom QML templates and also allows us to add more QML wizards for e. g. components later. This template mechanism allows substitution in comment, which allows us to keep valid QML file as templates. This reduces the maintance burden significantly. Change-Id: I7766b037635131da2af5aae518d6fe4597ff8b9f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
View Lorry Controller Status