| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
VERSION_FLAGS.<keyword> can now be used for all compilers and not
just armcc, and version flagging can now be used with QMAKE_LFLAGS
as well as QMAKE_CXXFLAGS.
Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords
for OPTION and LINKEROPTION statements, which are defined via
QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables.
This improves flexibility in the future if new keywords need to be
supported.
Task-number: QTBUG-8685
Reviewed-by: Janne Koskinen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | | |
| | |
| | |
| | |
| | | |
Remove local defines and passing of a list while its never used, only define
it where its actually used.
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
...
|
| | | |
| | |
| | |
| | |
| | |
| | | |
qmake for Maemo 5 needs to be bootstrapped with an older gcc, which
doesn't like foreach() in templates. Use a traditional for loop to
iterate over the container instead.
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
VERSION_FLAGS.ARMCC variable is used in symbian.conf to define
supported armcc compiler version flags. Values given to this
variable must be directly usable as ifdef flags in mmp.
QMAKE_CXXFLAGS.<version flag> variables can now be used to add
compiler options to specific compiler versions.
Note that options added via QMAKE_CXXFLAGS.ARMCC flag
will apply to all versions of armcc compiler.
Task-number: QTBUG-8685
Reviewed-by: Iain
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since the build process copies everything that is deployed using
DEPLOYMENT variable under epoc32 somewhere, pkg files might as well
look for the files from there. This can be useful for binary
releases if the release needs to be repackaged.
Task-number: QT-3147
Reviewed-by: Janne Anttila
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake_abld.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When using recursive QMAKE_EXTRA_TARGETS, qmake will use CHK_DIR_EXISTS
and MKDIR when ensuring each subdir has a Makefile created.
These previously weren't defined for Symbian.
Note that this problem was hidden in most cases, because a `qmake -r'
would have created the necessary makefiles already. The problem is revealed
when a .pro file does SUBDIRS+=foo.pro and foo.pro is also a subdirs project.
Reviewed-by: Michael Goddard
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits)
Fix dependency so it works also on massive parrallel systems
This should likely get webkit linking again on windows/sbsv2
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
Added rpp and rsg files to ignore filter.
Moved two profiles to the correct directory.
Fix build break caused by undefined symbol SetDialogPreference
Temporarily disable problematic dll.
Use the same concept for per-lib tweaks as armcc
Consistently use the * in configure
Symbian doesn't have large file support currently, just turn it off
Remove largefile config test
Make sure that we have all compile flags available always
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/embedded/anomaly/anomaly.pro
demos/embedded/flightinfo/flightinfo.pro
demos/embedded/lightmaps/lightmaps.pro
demos/embedded/weatherinfo/weatherinfo.pro
examples/network/fortuneclient/fortuneclient.pro
examples/network/fortuneserver/fortuneserver.pro
examples/network/network-chat/network-chat.pro
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/platform_paths.prf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
src/s60installs/s60installs.pro
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This enables it to be used by all Symbian build systems.
RevBy: Miikka Heikkinen
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.cpp
qmake/generators/symbian/symmake_sbsv2.cpp
src/plugins/plugins.pro
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qmake is a bit inconsistent in what it assigns to QMAKE_ORIG_TARGET
and TARGET, so we need to cope with the case where QMAKE_ORIG_TARGET
contains the proper target name and also when TARGET contains it.
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
mkspecs/features/symbian/qt.prf
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/src.pro
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
- Changed makefile generator name to SYMBIAN_UNIX, to be more in line
with the other generators.
- Explained the reason for avoiding virtual inheritance in a bit more
detail.
- Removed an unnecessary string replacement.
- Fixed the location of s60 plugins for MMP based generators.
RevBy: Miikka Heikkinen
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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.
|
| | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | /
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | |
| | | | | | | | | | |
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
change b37ac454832a23c17418f5ebca8928b63fe02289 changed sis file names
from qt_debug-armv5.sis to qt.sis
This updates the runonphone make target to the new sis file name
Reviewed-by: axis
|
| |\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
| | | | | | | | | /
| |_|_|_|_|_|_|_|/
|/| | | | | | | | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Added support for the following RSS_RULES variables to improve control
over placement of user defined rules inside application registration
resource file:
RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO
RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO
RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item
in the service_list of APP_REGISTRATION_INFO
RSS_RULES.file_ownership_list - Rule placed inside a
FILE_OWNERSHIP_INFO item in the file_ownership_list
of APP_REGISTRATION_INFO
RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the
datatype_list of APP_REGISTRATION_INFO
Task-number: QT-3083
Reviewed-by: Janne Anttila
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: mariusSO
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
fix "configure -fast" on Windows for other maketools than nmake
Get qmake to add pdb files to install target in debug configuration.
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
give symbian an own platform mode
deprecate -win32/-unix/-macx which set both host and target mode
decouple host platform mode from target platform mode
factor out applyHostMode()
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
use QDir::separator() instead of Option::dir_sep where appropriate
simplify string ops
sanitize evaluation of OS scopes
instead of hard-coding recursion for symbian, add it to the specs
add possibility to request project recursion from within a pro file
fix ts-assistant target
use QList::reserve() as appropriate
optimize appending of (empty) lists to (empty) lists
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
...
|
| | | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
... instead of using the gross isForSymbian() magic
Reviewed-by: mariusSO
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.
Task-number: QT-2909
Reviewed-by: Janne Koskinen
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
| | / / / / / /
| |/ / / / / /
|/| | | | | |
| | | | | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Prj_extensions tag is replaced with prj_testextensions tag when
CONFIG contains symbian_test
Task-number: QT-2985
Reviewed-by: Janne Koskinen
|
