Commit Graph

17 Commits

Author SHA1 Message Date
Christian Kandeler
08aaad92ac Maemo: Fix default deployment paths.
Applications must live in /opt/<project name> on Harmattan & Meego.

Reviewed-by: Alessandro Portale
2011-02-08 18:09:06 +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
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
1da6186979 App wizard template: Move Network capability into main .pro
Removes the "DEFINES += NETWORKACCESS" from the main .pro file
replacing it by "symbian:TARGET.CAPABILITY += NetworkServices".

Task-Number: QTCREATORBUG-3594
reviewed-by: con
2011-02-02 09:22:42 +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
edeb415908 Merge remote branch 'origin/2.1' 2010-12-10 11:09:55 +01:00
Alessandro Portale
274af0f2f9 Fixing several issues in folder deployment
- Also copying paths when doing in-source build,
   and not copying paths if source and target differ
 - Quote paths in order to support white spaces
 - Tolerate forward slashes as input paths

Task-Number: QTCREATORBUG-3203
Reviewed-By: ck
Merge-request: 226
2010-12-08 16:13:41 +01:00
Christian Kandeler
7a5c004763 Maemo: Change installation prefix for non-Fremantle systems.
- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
2010-12-01 16:56:51 +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
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
kh1
ab90be31de Some minor mobile app template fixes.
Reviewed-by: ck
2010-10-15 12:45:08 +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
Alessandro Portale
043cf532ec Improved the comments in the generate qml app code.
This was committed to the master branch, but was supposed
to go into 2.1 (I misunderstood the branching strategy of
Creator 2.1).

Since this does not change Creator code:
Reviewed-by: Trustme
2010-10-02 18:26:51 +02:00
Christian Kandeler
9d04cffe98 QML + Mobile wizard: Share deployment rules.
Reviewed-by: Alessandro Portale
2010-09-14 15:07:50 +02:00
Christian Kandeler
03c0060b96 Mobile + QML wizard: Share common resources.
Reviewed-by: Alessandro Portale
2010-09-13 17:52:16 +02:00