| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QT-2139
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
| |
Sis files are always generated in the pro file directory even if
TARGET indicates another target directory.
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
| |
The problem with hardlinks is that things start to behave funny when
you build several times, because on the next compile, the target from
armlink is moved to the .sym file location, and in this case it will
be hardlinked too. In the end you have all three files (bare, .exe
and .sym) being hardlinked together, when the .sym should be an ELF
file and the other two should be an E32 image.
RevBy: Trust me
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
| |
Platform paths provided by Symbian do not provide the full path to
headers. Ideally they should be used, by looking for and replacing
/epoc32 with the correct path. However, for now this is a good enough
solution.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
Dependencies to dso files were not generated correctly, both because
the PRE_TARGETDEPS variable seems to be local to the function it was
in, and also because the regular expression was wrong (it has to
match the whole string).
Also switched to qt_ style variable names to avoid clashes.
RevBy: Trust me
|
|
|
|
| |
This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
| |
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
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11396
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
|
| |
| |
| |
| | |
RevBy: Miikka Heikkinen
|
| |
| |
| |
| |
| | |
Task: QT-3540
RevBy: Thomas Zander
|
|/
|
|
| |
Not relevant anymore after 5b5ae51b22b.
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11670
RevBy: Trust me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The fixes were too complicated for a profile and so a perl script was
introduced. These are the issues that were addressed:
- Made sure that we link correctly in all cases where there is a
mismatch between the DEF file and the ELF file. Specifically, these
two cases:
- If elf2e32 detects a symbols in the ELF file that is marked as
absent in the DEF file, an ordinal mapping will not be
generated in the dso file. This means that binaries linking to
the library will not find the symbol, even though it exists in
the code. Since this is completely useless behavior, this was
fixed to include the symbol regardless.
- If the DEF file contains a symbol that is not present in the
ELF file, an ordinal mapping will be created in the dso file
regardless, which means applications can link to a symbol that
does not exist. This is even worse than point one, since it is
not detected until runtime, when the dynamic link will fail.
Fixed by leaving the symbol out of the dso file if it does not
exist in the ELF file.
Both fixes require rerunning elf2e32 to fix the symbol mappings
that were broken in the first run, but it only happens if at least
one symbol is broken in the way described above. Also, freezing the
DEF files will "save" the symbols, so that it does not occur after
that.
Note that this does not remove the ability to get the postlinker to
tell you about mismatches. By doing
"QMAKE_ELF2E32_FLAGS -= --unfrozen", the symbol mismatches will be
considered errors instead of warnings, and they can be caught that
way.
- Code that was previously in the profile was moved to the perl
script:
- Detecting that there are errors in the postlink and return
nonzero. elf2e32 does not do this on its own (at least not when
using Wine).
- Only overwriting the old dso file if the new one is different.
This saves build time, since binaries that depend on the
library do not trigger relink if the dso has not changed.
These two points simplify the code, and they will also help the
porting to Windows, since the old shell script tricks would not
have worked there.
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11351
RevBy: Trust me
|
|
|
|
|
|
|
|
|
| |
These definitions are not platform dependent as they must be exactly
what configure sets for plugins and imports paths, so moved them
out of data_caging_paths.prf into symbian.conf.
Task-number: QTBUG-11619
Reviewed-by: axis
|
|
|
|
|
|
|
| |
In case there is a slash in the target (for example; ../foo) then we
don't want to add a faulty cxxflags to the compile line.
Reviewed-by: Axis
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This function can be used to do smart prepending of epocroot to paths
defined by platform_paths.prf, though it'll work for any string.
This is useful because paths defined in platform_paths.prf can start
either with full epocroot or just slash depending on environment.
E.g.
exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(foobar.h))) {
...
}
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
| |
This reduces code duplication.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
| |
Local variables can't be counted upon between different profiles.
RevBy: Trust me
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
| |
If MMP_RULES contains EXPORTUNFROZEN, no DEFFILE statements should
be generated to mmp files.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
| |
Previously it would not use the autogenerated def files.
RevBy: Thomas Zander
|
|\
| |
| |
| |
| | |
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
| |
| |
| |
| |
| |
| |
| | |
QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR paths had double slash in
front of them.
Reviewed-by: Janne Koskinen
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/global/qglobal.h
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
My 4.6.3 changes.
Added my 4.6.3 changes.
My 4.6.3 changes.
Add my 4.6.3 changes
Fix WebKit version dependency in pkg files
Add support for including module specific .pri files as part of qt.prf handling
My changelog entries for 4.6.3
Add my changes to the 4.6.3 changes log
my changelog for 4.6.3
Switch Symbian^3 QCursor implementation back to 5.0 way
fix qmake -project once more
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Default to the Qt major/minor/patch version for WebKit, but use them
only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is
read by qt.prf
Task-number: QTBUG-10847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Clearing epocroot_prefix at the end of the file caused it to be empty
at the time replacement functions were resolved.
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | | |
Users can type 'make freeze' to get the def files updated right in
the git source tree
|
|/ /
| |
| |
| |
| |
| | |
This new target simply takes a sis file and runs the app on phone.
Reviewed-by: Shane Kearns
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
bye bye QMakeProjectEnv
short-cut evaluation inside if() tests
eliminate special splitting of INCLUDEPATH and DEPENDPATH
do not env-expand cache file path
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
s/INCPATH/INCLUDEPATH/
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
warn about usage of deprecated variables
warn about using non-lowercased replace $$function()s
add -Wdeprecated option (on by default)
make QMakeProject::isEmpty() consider legacy mappings
document some functions' scope
fix $$size() not using function-scoped variables
doc: Fixed some qdoc errors.
qdoc: Added breadcrumbs for namespaces.
Autotest: check that we receive key events on toplevel widgets
Cocoa: key events stopped working
Update Polish translations
qdoc: Added "All namespaces" to the API Lookup box.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qmake variables would have been exported to the command run by
$$system() and - optionally - to the command run by system().
however, this was a unix-only feature and made the kernel barf
at the huge environment on older linuxes.
as we don't like platform-specific hacks which are unreliable,
in particular when a workaround exists (the commands execute
shell code after all, so one can inject arbitrary env variables),
just blow it away - it was undocumented, after all.
Reviewed-by: joerg
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Symbian abld toolchain cannot handle very long paths for mifconv
source images, so do not absolutize the path. This should not
be a problem, as the absolute icon path is only needed for shadow
builds, which are not supported in symbian-abld anyway.
Task-number: QTBUG-10135
Reviewed-by: Thomas Zander
|
|/ / |
|
| |
| |
| |
| | |
The lib is only on the phone, so check the dso file instead.
|
| | |
|
| | |
|