| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-By: TrustMe
|
| |
|
|
|
|
|
| |
SBSv1 has also been updated to define the appropriate macros and add the
required library statements, so all that is needed is the STDCPP keyword
Reviewed-by: mread
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This way we avoid having a lot of code in a static (and
unmaintainable) library. The s60main static library now currently has
only one task: to call main().
To move the initialization into QtGui also meant a change in how the
S60 framework is created, because we can no longer use the trick
where we create and start the the S60 event loop and then have the
framework call us back to start main(). The initialization now
follows the creation and destruction of QApplication, which is a lot
more in line with how other platforms do it.
Since S60 doesn't support creating the environment, and *then*
starting it (both are executed by the same call), we had to open up
the S60 framework construction classes and just mirror what they do.
This means that after QApplication construction is done, the S60
framework is initialized, but nothing will run yet and control will
return to main(), where the user can start the event loop himself.
One of the quirks of this approach is that the construction of the
S60 framework makes a new cleanup stack. This means that any active
traps will not be active anymore, and leaving without setting a new
trap will most likely panic. This shouldn't be a problem for us,
since Qt is never supposed to leave, but it means that if anyone uses
the cleanup stack without setting a new trap, they will receive a
panic.
It was considered to add a trap mark in QApplication construction and
then removing it on destruction, but it was dropped because leaving
from main() is still undefined (even if the old cleanup stack would
be restored in the destructor, we wouldn't be able to stop the
exception from unwinding the stack, and the cleanup stack would then
be unbalanced).
RevBy: Jason Barron
RevBy: Janne Anttila
AutoTest: QWidget passed with same failure count
|
| |/
|
|
|
|
|
|
|
| |
The Symbian build system can't handle directories starting with a `.',
so qmake aborts if MOC_DIR and similar start with a `.'. However,
the check for this condition was faulty and would include any path
which contained a `.' anywhere.
Reviewed-by: Michael Goddard
|
| |
|
|
| |
Reviewed-by: Miikka Heikkinen
|
| |\ |
|
| | |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |/
|
|
|
|
|
|
|
| |
This reverts commit 4dd03abdfbcc1af3075b30165e19ee63fe8051f4. And changes
stl.prf slightly to get the Qt libs compiled again without reverted hack.
Conflicts:
src/gui/painting/qblackraster.c
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed symbian specific functionality from project.cpp:
- generate_test_uid qmake function removed
- Uids are now generated automatically for projects that don't have
one.
- Usage of ICON (in application_icon.prf) now requires explicit
UID3 definition.
- Autotests that require UID3 in .pro now define it explicitly
- Move most symbian specific function implementations away from
project.cpp to files under generators/symbian
Reviewed-by: Janne Anttila
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task: 242139
This commit replaces Symbian specific 'depends' keyword in qmake
DEPLOYMENT variable with two more generic ones. The new keywords
are 'pkg_prerules' and 'pkg_postrules', and they allow developer to
pass raw data to PKG file. The strings in 'pkg_prerules' are added
before PKG file package-body headers and 'pkg_postrules' after them.
Correspondingly as old 'depends' keyword, the new keywords are not
parsed by qmake, so they must be in a format understood by Symbian
package generation tools.
Note that 'pkg_prerules' can also replace default language,
package-header and vendor statements in pkg file. If you decide to
override any of these statements, you need to pay attention that
also other statements stay valid.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
Using two concatenated variables as an argument to exists() causes
problems because this can expand to '//' which qmake thinks is a valid
path (if at the beginning), but this is not what we want here. So add
a work around to manually expand the path without the additional '/'
character and then add a comment saying that changing one should change
the other.
Reviewed-by: Miikka Heikkinen
|
| | |
|
| |
|
|
|
|
|
|
| |
Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.
Rev-By: Harald Fernengel
Rev-By: Ralf Engels
|
| |
|
|
| |
RevBy: jbarron
|
| |
|
