| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
|
|
| |
Previously, the variable would be appended too soon, so not all
values would be included. Now it is one of the last steps.
RevBy: Trust me
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled previously disabled Qt features.
Fix includes so it compiles
Use lowercase includes so it compiles in Linux too
Fixed library dependency for Gnupoc.
Removed the --export_all_vtbl from linking.
Cleaned up the elf2e32 options a bit.
|
| |
| |
| |
| |
| |
| | |
It causes wrong exports.
This required rearranging some libraries to avoid undefined symbols.
|
|/
|
|
| |
Reviewed-by: joerg
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
This gets applications building again.
|
|
|
|
|
|
| |
Now the compiler specific options in gui.pro and WebCore.pro are
only for the mmp based build systems. Lets make that clear and mark
them as such.
|
|
|
|
|
|
| |
Users may do a CONFIG -= qt which means that the qt.prf won't
be loaded. So, lets make sure we don't have any critical properties
in those files.
|
|
|
|
|
|
| |
This adds support for .lib files, as well as removes support for all
others than .dso and .lib. This builds on the original commit
bdff51768dfe.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian-makefile.conf
mkspecs/symbian/features/symbian_building.prf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This also switches the official def file variable in qmake profiles
to DEF_FILE.
Support for freezing def files was also added, but needs more work
and is therefore disabled for now.
Task: QTBUG-7510
Task: QTBUG-8052
|
| |
| |
| |
| |
| | |
This saves rebuilding of components that depend on the current one,
by not updating the dso file unless it has changed.
|
| |
| |
| |
| |
| |
| |
| | |
This is required for correct intermodule building when def files are
off, since otherwise the ordinals present in the DLLs and the
ordinals linked to may be different. In layman's terms: If you build
QtCore, QtGui will also trigger rebuilding as a result of that.
|
| |
| |
| |
| |
| | |
Otherwise the users' statements would run before the binary was fully
linked.
|
| |
| |
| |
| |
| | |
the fork I made for gcce is similar enough to now be shared between gcce and
armcc so move stuff around a bit to avoid the code duplication.
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Spaces in filenames still won't work, but that is very tricky to fix
because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS
section.
Task: QTBUG-8555
|
| |
| |
| |
| |
| |
| | |
I call g++ to tell me the library paths for the compiler so
I can pass that on to ld. I'm a bit confused why this is needed,
need to find out if thats expected behavior for gcce
|
| |
| |
| |
| |
| |
| |
| | |
The defaults are apparently not all that useful in gcce as
elf2e32 doesn't like the stuff generated with them. So provide
some defaults and make a simple structure to set the gcce-only
defaults in one place. The qmake.conf for this mkspec
|
| | |
|
| |
| |
| |
| |
| | |
This moves some stuff from the common to linux-armcc specific
and updates the cloned gcce specs to do the right thing.
|
|/ |
|
| |
|
| |
|
|
|
|
|
|
|
| |
On symbian a target is forcebly called ${TARGET}.exe, so when make
checks for the existence on the filesystem for ${TARGET} it can't find
it and links again.
Avoid this by hardlinking ${TARGET} to ${TARGET}.exe
|
| |
|
|
|
|
|
|
| |
The rsc files are generated for the symbian build system out of rss files and end
up going onto the device (much like the .exe), so we keep them around on
'make clean' but remove them on distclean.
|
|
|
|
| |
Task-number: QTBUG-8055
|
| |
|
|
|
|
|
| |
The linux mifconv wrapper script has been fixed so this disabling is no
longer needed.
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/symbian/linux-armcc/features/symbian_building.prf
|
| |
| |
| |
| |
| |
| | |
This is required in the cases where the target does not directly
include the rsg files, but the corresponding rsc file is still needed
on the target device.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Most code was reused from the Windows generator. Icons don't
currently work due to a problem with the mifconv tool.
In addition backslashes were changed to slashes in all common code,
since qmake seems to prefer this when doing path cleanup and the
like.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It reuses almost everything from the original pkg generator, but the
code had to be restructured to accomodate for the new makefile
generator. In addition a few new codepaths and profile changes had to
be introduced to cope with the fact that this mkspec puts files in
different places than Symbian does (inside $QTDIR/lib instead of
$EPOCROOT/...).
This enables the pkg generator to generate correct pkg files for Qt
itself, but applications will not work yet because they also require
generated rss files.
|
| |
| |
| |
| |
| |
| |
| | |
If we want translations to work, we need lrelease, so that should not
be disabled anymore for symbian.
Work around the hack of translations/translations.pro to not link anything
so we don't do post-linking on symbian (which failed).
|
|\ \ |
|
| |/
| |
| |
| | |
An extra define needs to change between ARM/Thumb.
|
|/
|
|
|
|
| |
elf2e32 doesn't seem to return a non-null value on error. To avoid silently
continuing we need to detect there is an error in the output of the command
and stop the build if there is.
|
|
|
|
|
|
| |
For some reason, it does not return an error code, even when there
clearly is an error. Therefore we scan for the occurrence of an error
in the output and base the return code on that instead.
|
| |
|
|
|
|
|
|
|
|
| |
Pre 2.6.23 Linux kernels have a limit on the environment size that
can be passed to a forked process. We quite easily overstep this
boundary when building big projects on Symbian, and since we depend
on running the system() command, this causes the build to fail. This
commit tests that system() can be successfully run.
|
| |
|