Commit Graph

28 Commits

Author SHA1 Message Date
Alessandro Portale
1cce35ecf5 Code deduplication.
The 'include(deployment.pri)' is now removed in a central place.
2011-03-18 17:50:15 +01: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
Alessandro Portale
aa453c8062 Implemented "import" and "Url" options for html5 app wizard 2011-02-09 16:23:45 +01:00
Alessandro Portale
4413f9d621 Refactoring. Unduplicating code.
The loop to generate the "DEPLOYMENTFOLDERS" part in the main
.pro file is now in the base class AbstractMobileApp.
2011-02-07 17:50:21 +01:00
Alessandro Portale
661742711e Rename: bool "uncommentNextLine" -> "commentOutNextLine" 2011-02-06 19:27:57 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
con
b69ab309cd Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/debugger/debuggeractions.cpp
2011-02-04 11:46:30 +01:00
Alessandro Portale
efc596170c Refactoring the template code updater. Reusable for html5
Less static functions, more ploymorphism.
2011-02-03 19:48:12 +01:00
Alessandro Portale
d4e5890286 Removing the usage of Avkon to lock the screen orientation
Locking the screen orientation was not a Qt feature of the Symbian
port till Qt 4.7.2. Therefore, client applications had to do the
locking themselves. That locking is right now only achievable by
using Avkon Api. The template code of the Qt Quick App wizard did
exactly that.
Now, Qt 4.7.2 has the screen orientation lock built in. That
implementation was done for QTBUG-11785. No need to do that in the
application code, anymore.

This patch removes Avkon usage from the templates, using new enum keys
and setting QWidget flags, just like Maemo5 does.

Two Qt version checks/fixes:
1) If the application tries to lock the orientation on Qt < 4.7.2,
   a warning is given that this won't work
2) If Qt < 4.7.2 is used to build the application, the enum keys are
   not used directly but casted from constants

Task-Number: QTCREATORBUG-3598
Reviewed-by: ck
2011-02-03 12:50:01 +01:00
Alessandro Portale
6bf98fb7c3 App wizard template: Network capabilty on by default
Sets the Network capabilty on by default, in the wizard.

Task-Number: QTCREATORBUG-3594
reviewed-by: con
2011-02-02 09:21:39 +01:00
Tobias Hunger
0f4d34ae96 Fix bogus warnings when creating a new project
Fix bogus warnings about build locations when setting up a new project.
2011-01-24 15:00:40 +01:00
con
34f28a87ab Merge remote branch 'origin/2.1' 2011-01-24 14:01:04 +01:00
dt
2de93e9b96 QML template: Do not override user settings for icon and epocheapsize
Task-Nr: QTCREATORBUG-3454
Reviewed-By: Alessandro Portale
2011-01-12 15:40:20 +01:00
con
54f4fba003 It's 2011 now. 2011-01-12 15:34:06 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Alessandro Portale
fabaffde4f Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.

The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.

This patch removes the -leiksrv and bumps the version for
the template.

Cherrypicking into qtcreator/2.1 is highly recommended.

Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
2010-11-22 11:06:45 +01:00
Alessandro Portale
f1a403c778 Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.

The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.

This patch removes the -leiksrv and bumps the version for
the template.

Cherrypicking into qtcreator/2.1 is highly recommended.

Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
2010-11-19 21:11:33 +01:00
Alessandro Portale
8eb60c6598 Filtering '-' out of generated projects
(In QtCreator the wizard would take care of that.)
2010-11-16 20:56:01 +01:00
Alessandro Portale
7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
2010-11-01 17:03:46 +01:00
Alessandro Portale
e1aa293544 Qt Quick app wizard: Merge two .pri files into one
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.

At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.

And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.

Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
2010-10-04 10:54:25 +02:00
Alessandro Portale
a95ed6420d New wizards: Handle Symbian icon like Maemo icon
De-clutter the app profile:
- Call the Symbian icon <project>.svg
- Define the Symbian icon in the deployment .pri file

Task-Number: QTCREATORBUG-2578
Reviewed-by: ck
2010-10-04 10:54:24 +02:00
Pawel Polanski
94c4ee86c2 UID generator generates upercased values 2010-09-24 16:26:40 +02:00
Friedemann Kleint
19a1210376 L10n: tr()-fixes. 2010-09-23 15:18:07 +02:00
Christian Kandeler
002ca9ca7b Abstract Mobile Wizard: Prettify version number.
Reviewed-by: Alessandro Portale
2010-09-20 09:35:36 +02:00
Christian Kandeler
02a4fc72b9 Mobile Wizards: Change version string in generated files.
Hexadecimal format is easier to parse for humans.
2010-09-17 15:10:21 +02:00
Christian Kandeler
ee85384cc9 QML/Mobile wizard: Factor out common parts.
Reviewed-by: Alessandro Portale
2010-09-16 14:12:25 +02:00