| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Create stub sis during the (tools2) configure step of the Symbian build.
This allows changing of the stub sis package version just by modifying
the qt_stub.pkg file.
Change-Id: I8260fc3db3d6e41926f2217542f84ec93868b65f
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
When hardware configuration has no OpenGL ES 2 support indicated, leave
OpenGL ES out of Qt compilation alltogether.
Task-number: ou1cimx1#987609
Change-Id: If43a8de059596fbdb52c97535436c441760c97ab
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This continues work done in commit "Bump Qt version to 4.8.1"
8ced172dd250277f38cc3d2753692cda0fa183da by updating version number
to Symbian specific files also.
Updated Qt version to 4.8.1 in pkg files and ROM stub file.
Task-number: ou1cimx1#987442
Change-Id: Ia71dff65956453a0eceb4b8ebba187289f20eebf
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
| |
Enable Symbian platform autodetection to differentiate between platform
versions.
Change-Id: I9553d181952f011b162232cc8946d0dc0a64d92c
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Symbian package definition has been changed so that the build filter
definition in package_definition.xml is identical. This allows them
to be built in a separate build phase.
Change-Id: Ie29f2358a6c6d796a32b78d9439ed899c43a49ad
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
| |
Clean whitespaces and old comments on the file.
Change-Id: I34e4e6ccb2c2e4f5c3dcbbad2c0933cde8215f3f
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
| |
Manually update strings that did not get fixed by previous
search-and-replace.
Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| |
| |
| |
| | |
These files turn out to be scripts.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Update the cases to match actual files in Symbian, and add EPOCROOT
prefixes to data files in iby.
Reviewed-by: Juha Kukkonen
Task-number: QTBUG-14361
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change the Symbian Raptor configure options to use debug variant when
using configure-sh on linux crosscompilation, so that it matches with
result of configure.exe on windows.
Reviewed-by: Miikka Heikkinen
Task-number: QTBUG-14361
|
|/
|
|
|
|
|
|
|
| |
The qtconfig.flm is mostly rewritten to support parallel Raptor
Linux-Symbian cross-compilation.
Reviewed-by: Miikka Heikkinen
Done-with: Samu Sillanpaa
Task-number: QTBUG-14361
|
|
|
|
|
|
|
|
|
|
|
| |
- Generate temporary whatlog file under epoc32/build rather than the
source directory.
- Remove depenedency to qmake building from WHAT target to ensure
nothing is built if "sbs -c tools2 --what" command is issued as that
is supposed to just list what was built.
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building Symbian platform itself, the lower layer libraries are not
available on configure phase, and the config.test build scripts fail,
creating false "NO"-flags (also config.test currently does not work with
Symbian raptor). This fix aligns the configure results of configure-sh-
script with configure.exe as far as possible and fixes couple of symbian
cross-compilation configure issues, as detailed below:
Configure sh-script:
- Disable configure tests with symbian-sbsv2 where the failing test
would result to invalid disable-flags
- Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that
are not produced by configure.exe either
- Fix emitting of "QT_NO_GUI" flag (in all environments)
qtconfigure.flm:
- Copy mkspecs as files to /epoc32/... instead of symbolic link
Reviewed-by: Miikka Heikkinen
Task-number: QTBUG-14361
|
|
|
|
|
|
|
|
| |
Add language files translated to all Symbian supported languages,
reduced to items likely seen in Symbian.
Task-Number: QTBUG-4919
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
| |
- Headerexport script is only called once, whatlog is stored into a file
- Sed is only called once
- Properly added generated tools to whatlog
Task-number: QTBUG-22521
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
| |
Symbian configuration changed to use opengl es2 parameter which
works both with configure.exe (symbian windows building) and
configure sh-script (symbian linux building).
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
| |
Task-Number: QTBUG-4919
Reviewed-by: Honglei Zhang
|
|
|
|
|
|
|
|
|
| |
All builds will now add anything generated via QMAKE_EXTRA_COMPILERS
to whatlog. In addition, platform builds will now add to whatlog
the exported mkspecs and qmake_clean.flm that were missing.
Task-number: QTBUG-21591
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
|
|
|
| |
Doing "sbs -c tools2" exports Qt headers under epocroot, but didn't
list the exported headers with "--what". Added "-what" parameter
support to headerexport perl script and utilized that in
qtconfig.flm to generate list of exported files for
"sbs -c tools2 --what".
Task-number: QTBUG-21155
Reviewed-by: Sami Merila
|
|
|
|
|
|
| |
S60_VERSION and SYMBIAN_VERSION were obsolete in environment.prf.
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
|
| |
$(EPOCROOT) in qt.conf resolves epocroot from environment variable,
which is wrong when doing full platform build and qmake is executed
in context of sbsv2 tools build. The correct way to resolve epocroot
in qt.conf is to use $${EPOCROOT}.
Reviewed-by: TrustMe
|
|
|
|
|
| |
Task-number: QT-5158
Reviewed-by: Sami Merila
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-18614
Reviewed-by: TrustMe
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
| |
Added a dummy Qt sis file and fixed paths in bld.inf.
Otherwise build would fail when FF_QT_IN_UDA is defined.
Dummy Qt sis file needs to replaced with a real one
when actual UDA image is created.
Task-number: QT-4888
Reviewed-by: Guoqing Zhang
|
|
|
|
|
|
|
|
|
| |
Remove file listing from the stub package file to ease maintenance,
generate stub sis from it and export it to the correct location to
be included into ROM.
Task-number: QT-4817
Reviewed-by: Guoqing Zhang
|
|\
| |
| |
| |
| | |
Conflicts:
src/s60installs/qt.iby
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Miikka Heikkinen
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- qaudio.dll is no longer built separately, it is static part of
QtMultimedia.dll
- s60main resources are no longer needed or generated
- Webkit files are installed via separate IBY
Task-number: QT-4839
Reviewed-by: Guoqing Zhang
|
|\ \ \
| |_|/
|/| | |
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/|
| |
| |
| |
| |
| | |
Tests not in use anymore, removed from the layers and package
definition files.
Reviewed-by: TrustMe
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Temporarily removed Harmattan specific patches
Harmattan: fixed license headers.
Added Harmattan specific debian files to master branch.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Patches are not applying properly yet, so no use to release them.
Reviewed-by: TrustMe
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Debian packaging files added to Master branch. One
translation file was removed as it was a left over from
an old commit. Reference to it was removed from rules file.
Similar commit is done for Harmattan as well. Task: BACKEND-564
Reviewed-by: Adrian Constantin
|
|/ /
| |
| |
| |
| | |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Removed extra path component
Reviewed-by: Hannu Niinimaki
|
|/ /
| |
| |
| |
| |
| |
| | |
Removed most functionality from syncqt to get a straight copy
functionality.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
For Symbian, headers get always exported, and timestamps are not
needed.
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| | |
that's their only purpose. the rest of the contents is just nonsense.
|