Commit Graph

30 Commits

Author SHA1 Message Date
Thomas Hartmann
95a028e835 Wizards: changes the structure of Wizards
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>
2012-02-08 17:42:27 +01:00
Thomas Hartmann
821eab6c52 Wizards: refactoring - adding WizardDialogParameters
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>
2012-02-07 16:26:10 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
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>
2012-01-18 15:13:52 +01:00
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-14 21:13:41 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
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
2011-11-11 09:46:25 +01:00
Alessandro Portale
f642280ee5 App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0
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>
2011-11-03 19:54:44 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Daniel Teske
d2243c9765 Add a maximum Qt Version to the wizards
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>
2011-10-20 11:58:37 +02:00
hjk
28535f7571 utils, qmljstools, vcsbase: s/\bm_d\b/d/g
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-15 14:11:09 +02:00
Jarek Kobus
6d90cabe7f Clear minimum Qt version and required features when needed
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>
2011-08-02 14:24:09 +02:00
Daniel Teske
37f6d97f43 Fix Qt Quick Wizard, allow 4.7.0
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>
2011-07-20 11:35:43 +02:00
Daniel Teske
050af03876 Reset ignoreGenericOptionsPage in Qt Quick wizard
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>
2011-07-18 19:46:25 +02:00
Kai Koehne
30ff312929 QtQuickApp wizard: Merge Components and Sources page
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>
2011-06-29 18:01:01 +02:00
Kai Koehne
5c9b8946ce QtQuickApp wizard: Add Qt Components for Meego/Harmattan
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>
2011-06-24 15:50:45 +02:00
Kai Koehne
cdda5c775d Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"
This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:36:28 +02:00
Kai Koehne
e1256f11f4 QtQuickApplication wizard: Don't show Harmattan targets for symbian components
Change-Id: Ia5108c04d7898567ece7b5498359c88210ed2682
Reviewed-on: http://codereview.qt.nokia.com/695
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:33:33 +02:00
Kai Koehne
31904563bb QtQuickApp wizard: Add option for QtQuick 1.1 module
Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-23 14:36:52 +02:00
Feetu Nyrhinen
2964f7a9fa Qt Quick Components Wizard
Selection of Qt Quick component set
and use of specific QML template files (Qt Quick 1.0 and
com.nokia.symbian 1.0) based on the user selections.

Change-Id: I93cfa8735dcf285c76ff04a6186a4eca1f90a361
Reviewed-on: http://codereview.qt.nokia.com/567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-22 15:26:55 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-24 18:35:11 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
d0f7be188a Fix qt version number in Qt Quick Wizard
Temporal lapse in understanding which qt version is required for the Qt
Quick Wizard. On Maemo we have the Qt Quick compat plugin which allows
the generated project to work with 4.7.0. In theory that doesn't apply
to symbian, but qt 4.7.0 does not support symbian. (And on the desktop
everyone has upgraded.)

Reviewed-By: ck
2011-04-13 10:14:16 +02:00
dt
cd21066469 Fix minimum qt version for mobile/html wizard
That was broken by the TargetSetupPage refactoring

Task-Nr: QTCREATORBUG-4486
Reviewed-By: ck
2011-04-12 19:07:32 +02:00
Kai Koehne
7365be7cf6 MobileWizard: Export library symbols to allow wizards in external plugins
Qt components want to provide Qt Quick Application wizards in their own
repos. Allow them to use the MobileAppWizard infrastructure.

Reviewed-by: Alessandro Portale
2011-03-16 15:29:05 +01:00
dt
06ee3aee7f Qt4ProjectManager: New TargetSetupPage
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories

Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.

a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
   in their default implementation. (Or only slightly customize like
   the desktop target does.)

Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
   (It should match the look and feel from the other widgets.)
   It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
   and set up the target anyway you want.
2011-02-22 15:35:24 +01:00
Alessandro Portale
a89bac3c3c Refactoring. Move post generation file open to base class. 2011-02-10 22:45:18 +01:00
Alessandro Portale
8678af3240 Refacoring. Saner Api for QtQuickApp.
Now using an explicit Mode (generated, imported) instead of empty
or set filename convention. Just like in Html5App.
2011-02-09 21:39:46 +01:00
Alessandro Portale
6fc21c3416 More "qml[standalone]app" -> "qtquickapp" renaming 2011-02-07 12:47:07 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00