Commit Graph

32 Commits

Author SHA1 Message Date
Alessandro Portale
ae23d50576 Removal of Symbian support
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>
2012-08-22 13:42:42 +02:00
Joerg Bornemann
b1888c76ba adjust deployment.pri to DEPLOYMENT variable changes in Qt 5
X.sources has been deprecated in Qt 4.8.0 and removed in Qt 5.

Change-Id: I3d5228bd6db6d3eaccd76fc49e9b934263f9922c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-07-03 11:35:06 +02:00
BogDan Vatra
50e8f7bb7b Android plugin
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-24 12:25:40 +02:00
Christian Kandeler
b1b431f21f Harmattan: Fix aegis template.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=298677
Change-Id: Iaf8206874bac34e959aad62011e331cef5904b37
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-22 14:05:24 +01:00
Christian Kandeler
0a59f34794 Harmattan: Introduce new condition for auto-generation of manifest file.
In addition to using an empty file as in 2.3, the user can now also put
a magic string at the start of the manifest file. This way, we can use
this as the default while also documenting it in-place.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I375a73a5d2e9d3e0973d97d81e0110e788d0159a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-05 16:34:54 +01:00
Alessandro Portale
b58a7aef17 QtQuick/Html apps: Fix some non-shadowbuild cases
If the .target of a .source/.target tuple is empty, we get a "//"
in the path. Let's replace it with a "/" before string-comparing
it to another path.

If the .target is just a "." like in the HTML template code, we get
to replace a "/./" with a "/".

Change-Id: I5b6fef93c3efd5a21f9461b6e85c76f13bfb75e1
Task-Id: QTBUG-21060
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-11-04 20:08:31 +01:00
Christian Kandeler
5c6e760d0b Harmattan: Support "no Aegis manifest file" case.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I66aa22140362141c36070ab971d2283f60bcb49d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-10-13 17:46:25 +02:00
Kai Koehne
0702e8a3b5 MobileWizards: Rename MaemoPngIcon to just PngIcon
Change-Id: I3aa1f0eb3d2a894ba816c0d055d847a21f71da27
Reviewed-on: http://codereview.qt.nokia.com/3110
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-08-26 12:47:22 +02:00
Christian Kandeler
75a86a7951 MeeGo: Make use of new qmake flags.
Change-Id: I0cbb934e2c49c7c99b6fff0b8f92e5802471ef8c
Reviewed-on: http://codereview.qt.nokia.com/1326
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-07-08 14:30:40 +02:00
Christian Kandeler
84f60e5fda Maemo: Use different desktop files for Fremantle and Harmattan.
So far, we desperately tried not to duplicate the desktop file,
resorting to all kinds of "clever" heuristics in the process.
This is, however, somewhat limiting and confusing to users,
because we do magic stuff behind their backs.
So it seems better to "give up" and use two desktop files.

Change-Id: Idf969eb3ad365f080e5a9c1608149ea6de629d5c
Reviewed-on: http://codereview.qt.nokia.com/31
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-05-23 13:10:56 +02:00
Christian Kandeler
12b2a5fff0 Maemo: Harmattan application icons are now 80x80 pixels big.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=250237
2011-04-29 09:45:35 +02:00
Alessandro Portale
f1033737c7 Another fix for shadow build deployment with sh.exe in path
The "isEmpty(QMAKE_SH)" test is nonsense in the case of an msvc
build, because for msvc, sh.exe is never executed (although QMAKE_SH
is set.

"isEqual(QMAKE_DIR_SEP, \\)" is now the ultimate test. QMAKE_DIR_SEP
will only be "/" if sh.exe is in the path AND win32-g++ is used.

Task-Number: QTCREATORBUG-4455
2011-04-11 13:29:24 +02:00
Alessandro Portale
a6213ba901 Double escaping backslashes for regular expression
The first parameter of qmake's replace function is a regular
expression. So it needs to be escaped once for the qmake parser,
and then for the regular expression.
2011-03-30 19:23:27 +02:00
Alessandro Portale
3b9438f7d5 Fix deployment with MinGW and sh.exe in path
When building with MinGW and sh.exe is in the path, we should/can
not use xcopy in our deployment code. This patch detects the
presence of sh.exe and adjusts the behavior accordingly.

'cp -r' is used directly instead of $(COPY_DIR), because the fix
for QTBUG-17315 is not yet in a released Qt version.

'mkdir -p' is used directly instead of $(MKDIR), because the
QMAKE_MKDIR for win32-g++ (in case of QMAKE_SH) does not have
the '-p'. A least not til Qt 4.7.3.

Task-Number: QTCREATORBUG-3094
Reviewed-by: Oswald Buddenhagen
2011-03-30 19:23:27 +02:00
Christian Kandeler
ad6a66ce20 Mobile app wizard: Fix desktop file contents.
The "Exec" value was not consistent with the installation prefix in the
.pri file.
2011-03-29 14:41:41 +02:00
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