summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-291-275/+0
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove Meego support from QtQuickApp project templatehjk2013-10-161-2/+2
| | | | | | | Also bump the minimum Qt version required for new Qt Quick apps to 4.8 Change-Id: Ieeabc8475ccfa7f9fec7ca08cd88384ed88f0d1d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-161-1/+1
| | | | | | 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>
* Remove support for Madde-based platforms.Christian Kandeler2013-10-151-17/+0
| | | | | | | | With Nokia's decision to stop support for Harmattan applications in their app store, the last remains of a use case have disappeared. Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Wizards: Adding application wizards for Qt Quick ControlsThomas Hartmann2013-10-011-0/+18
| | | | | | Task-number: QTCREATORBUG-9477 Change-Id: I4eaf70089e19f0fcab8d85d9a101f74e119bbae0 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Qt4ProjectManager: Fix wrong include.Christian Kandeler2013-09-271-1/+1
| | | | | Change-Id: I403cfcef7c99e2963c60f332ecd24eb8e07db89a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* TargetSetupPage: Generalize the pageTobias Hunger2013-09-271-3/+3
| | | | | | | | | | | | | | | | Generalize the target setup page and move it into projectexplorer Move the qmake specific code into a projectimporter class with a specialization for qmake projects in the qt4projectmanager. This change depends heavily on the BuildConfigurationFactory cleanups done earlier and completes that change in such a way that generic build configuration factories are now in theory possible. The remaining problem is how to select the best factory of several that claim to be able to handle a kit and that is left for the next patch. Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Cleanup IWizard interface and usershjk2013-09-241-59/+41
| | | | | | | Added 639 lines, removed 1391. Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qt Quick Wizard: Fix text in wizard descriptionDaniel Teske2013-04-231-6/+6
| | | | | | Change-Id: I9f8b110e3d88fa3e9fc02a1c82e8bad0bf670d8b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Clean headers in Qt4ProjectManager.Friedemann Kleint2013-03-281-3/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qt4ProjectManager: Forward-declare some classes.Friedemann Kleint2013-03-281-0/+1
| | | | | | Change-Id: Ia05cbfec090bf42d8b9c0475e8904dbad12486d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Doc: replace "element" with "QML type" or "item"Leena Miettinen2013-03-131-4/+4
| | | | | | | | | | | Try to make terminology more consistent, by using "QML type" when describing the types, "item" when describing instances of QML types, and "component" when describing objects built by using QML types. Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix Krazy warnings about includes/header guards in Qt support.Friedemann Kleint2013-03-121-1/+1
| | | | | Change-Id: I82d54d4011beb6d0ca6f3da21885440af422a5a2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QtQuickAppWizard: adding missing wizardThomas Hartmann2013-02-141-3/+17
| | | | | | | | Adding Qt Quick 2 Application (from Existing QML File) wizard. Task-number: QTCREATORBUG-8755 Change-Id: I3f5bdac5356ec31a4f6c1cd8e2a21f61982b04ee Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Features: Use Core::Id as basehjk2013-01-151-1/+1
| | | | | | | | | | Change-Id: Iab812778f8f924638224ec343cadac70e8854e4f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Qt4PM: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-271-1/+1
|/ | | | | | Change-Id: Id6c19c0a2a982e7a9b11d7ef0740c0258dbdc7b7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QtQuick wizards: Mark all wizards as either Qt Quick 1 or Qt Quick 2Kai Koehne2012-11-221-4/+4
| | | | | | | | | | | Mark especially the import wizard as Qt Quick 1 only (we won't provide a Qt Quick 2 version at the moment, and will most likely remove it completely in 2.7) Task-number: QTCREATORBUG-8313 Change-Id: I2dc0d4055a7e174d3d92525189c0d98e3b1f8860 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QtQuick 2 Application WizardAlessandro Portale2012-09-041-4/+18
| | | | | | | | | | This patch adds a new variant of the good old ugly QmlApplicationViewer wizard. The new one is QQuickView based, and thus targets QtQuick2 Change-Id: I049223f644029e75bd15120b003c0ce4907a547a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Removal of Symbian supportAlessandro Portale2012-08-221-16/+1
| | | | | | | | | | | | | | | | | Qt Creator's support for Symbian was at its peak in version 2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6. It is most likely rotten. Let's remove it! Also, the Symbian support code was spread throughout the whole Qt Creator code base. The plugin interfaces evolved in the meantime and target platforms like Android or QNX have 99% of their code in separate plugins. In case anyone wants to revive Symbian support in Qt Creator, please create a plugin for it. Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't show the target setup page on adding a subprojectDaniel Teske2012-07-031-3/+5
| | | | | | Task-number: QTCREATORBUG-7426 Change-Id: I69232c9cd924a701a5c7b48d124ed2319337ea02 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* UI text: use book style caps for options in selection listsLeena Miettinen2012-03-081-6/+6
| | | | | | | MeeGo Harmattan is written without a slash. Change-Id: I439a518d686835b173030282463c55d48a66a562 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Wizards: fixing requirements for QtQuick Application WizardThomas Hartmann2012-03-061-4/+6
| | | | | | | We also want to still support Qt Quick 1.0 Change-Id: I2f0923034e30f94ac84f50618a0819895318a6ba Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: creating a project from existing qml file requires 1.1Thomas Hartmann2012-03-061-1/+1
| | | | | | | | Wizards: Creating a project from existing qml file also requires Qt Quick 1.1 Change-Id: I2aae04276685c05ce45fff3d5f1a8f0c898abdb6 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QtQuickAppWizard: stating qt requirements in the description.Thomas Hartmann2012-02-281-5/+5
| | | | | | | We should mention the correct Qt requirements to avoid confusion. Change-Id: I8d729075359606b632ed617ae898d9f9ddacdfa2 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: improve ordering - Qt Quick Wizards get higher priorityThomas Hartmann2012-02-221-1/+1
| | | | | Change-Id: I4297125fd2b220d68cfa287c65be857241786819 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-3/+3
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Wizards: splitting QtQuickAppWizardThomas Hartmann2012-02-141-36/+119
| | | | | | | | | | | QtQuickAppWizard currently has a combobox representing the choice of Qt Quick Components + the option to import .qml. After this patch instead of deciding this inside the wizard the decicion is made by choosing one of 4 instances of QtQuickAppWizard. Change-Id: If2f295b1dfc760d195dee83c59794104935016ce Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: removing feature GENERIC_CPP_ENTRY_POINTThomas Hartmann2012-02-141-3/+1
| | | | | | | We want finer grained features Change-Id: Id65d58409a6960aa9d132cb29592b921ee6bcfdf Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Wizards: changes the structure of WizardsThomas Hartmann2012-02-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This patch introduces platforms as a top level topic when choosing a wizard. Also I changed the categories and priorities. Details: 1. I did change the way the dialog/view is structured in newdialog.cpp 2. I added platformName() and supportsPlatform() to BaseQtVersion. I needed two functions because the Simulator does not provide a platform and therefore has no platformName but supports two platforms. I still have to turn the platform names into proper constants. 3. I changed the categories and priorities to get the layout that was discussed. (I had to touch quite alot of files but this is mostly trivial) 4. I added a combobox that allows filtering for platforms. 5. I added flags() to IWizard to indicate that a wizard is platform independent. Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: refactoring - adding WizardDialogParametersThomas Hartmann2012-02-071-5/+9
| | | | | | | | | | | | | The Wizards itself (derived from IWizard) and the dialogs implementing the wizards were quite discoupled. Since I want to add parameters that are delivered from IWizard::run to the dialog a I added WizardDialogParameters. Examples of paramters I want to add are the choosen platform and the choosen subOption/template for this wizard. Change-Id: I9c0ae2901e3d46d3c36a3f433f4d7d508a6ba74e Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Wizards: allows filtering of wizards based on Qt versionThomas Hartmann2012-01-181-10/+11
| | | | | | | | | | | | | Every wizard now implements requiredFeatures() to define a feature set. If the feature set is not satisfied by the available Qt Versions, the wizard is not shown in the create file/project dialog. Every Qt version can define the provided feature set in availableFeatures() defined in BaseQtVersion. Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-141-2/+2
| | | | | Change-Id: If9fd111032975d2a313084f5fedf20561806e268 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0Alessandro Portale2011-11-031-4/+4
| | | | | | | | | | | | | | | | Bumping the minimum required Qt version from 4.7.3 to 4.7.4, accordingly. Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Add a maximum Qt Version to the wizardsDaniel Teske2011-10-201-1/+1
|/ | | | | | | | | All existing wizards derived from AbstractMobileWizard do not support qt 5. So they won't offer them, nor default to them. Task-number: QTCREATORBUG-6321 Change-Id: I999e2565cec5b0d7da04c10e38ac2cb101352e5b Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* utils, qmljstools, vcsbase: s/\bm_d\b/d/ghjk2011-09-151-17/+17
| | | | | | Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd Reviewed-on: http://codereview.qt-project.org/4992 Reviewed-by: hjk <qthjk@ovi.com>
* Clear minimum Qt version and required features when neededJarek Kobus2011-08-021-0/+4
| | | | | | | | | | | | When the user chooses back button and select something different than Symbian or Meego the above fields should be cleared. Task-number: QTCREATORBUG-5708 Change-Id: I2a8557cd1ab60dfc309c585399cd5b2210b44cc9 Reviewed-on: http://codereview.qt.nokia.com/2513 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix Qt Quick Wizard, allow 4.7.0Daniel Teske2011-07-201-1/+1
| | | | | | | | Task-number: QTCREATORBUG-5473 Change-Id: I41e16d4a8a22e9c5ffa44711a33a71248a8bd993 Reviewed-on: http://codereview.qt.nokia.com/1846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Reset ignoreGenericOptionsPage in Qt Quick wizardDaniel Teske2011-07-181-0/+1
| | | | | | | Change-Id: I2cef1387430cd27783f9ee6cb1bea548eb58575c Reviewed-on: http://codereview.qt.nokia.com/1325 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QtQuickApp wizard: Merge Components and Sources pageKai Koehne2011-06-291-8/+3
| | | | | | | Change-Id: I48e5009f2f71562a700eabddf38e54c1d4a127c1 Reviewed-on: http://codereview.qt.nokia.com/913 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QtQuickApp wizard: Add Qt Components for Meego/HarmattanKai Koehne2011-06-241-0/+5
| | | | | | | Change-Id: I4809de36e4913037439ab9eb7c56021431cff365 Reviewed-on: http://codereview.qt.nokia.com/704 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
View Lorry Controller Status