Since this was the only template using the qt quick application viewer,
remove all traces of that too.
And this was also the only "upgradeable" template, so remove all traces
of the upgrade code too.
Change-Id: I68989dc5a87621593f3b5dd8c4979bb59f137200
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.
Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
- andorid-no-sdk should not be used for new projects anymore.
- The android scope is handled in android.prf in qt, and there the
handling is better, so removing this actually fixes a bug.
Change-Id: I2b901e0cb1fd4bc0d00fbcd3c8ea08b22e4bca49
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
A missing else was causing the else:unix-branch of the ios condition
to always execute for unix platforms, overwriting any of the
settings from before. Result was e.g. that Android builds would
not properly install their assets.
Change-Id: Icf8d2e77ff7eaea478cc2f945d3aee7929cc4078
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
An app with Qt Quick {1,2} Application template is installed under /opt/
and there is no easy way to change the installation path.
This change allows users to set installation path in the main pro file.
Change-Id: I0325c54187f781b1ceaaddfd41e913117fa445e6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Removes TARGET.EPOCHEAPSIZE and TARGET.CAPABILITY definitions (both are
specific to Symbian platform and now obsolete).
Change-Id: I5d1f00717c5284945551cc2472af67e0d80b736a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
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>
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>
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>
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>
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>
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
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.
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
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
Removes the "DEFINES += NETWORKACCESS" from the main .pro file
replacing it by "symbian:TARGET.CAPABILITY += NetworkServices".
Task-Number: QTCREATORBUG-3594
reviewed-by: con
- 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
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
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
- 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
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
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
