| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
|
| | |\
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian configuration parameter change for linux building
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Improve patch_capabilities script output.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Now prefix any actual patching errors with "ERROR:" so that they will
be obvious also in QtCreator builds.
Task-number: QTBUG-22267
Reviewed-by: Sami Merila
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix QtSql autotest server addresses
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix QtSql autotest server addresses. Old server which are located in
Oslo shall not be used. New servers are located in Brisbane.
Reviewed-by: Trust Me
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Update SQLite version number in legal document
|
| | | |
| | |
| | |
| | |
| | |
| | | |
SQLite version in Qt 4.8 is upcated to 3.7.7.1.
Reviewed-by: Trust Me
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Update SQLite version mentioned in licence document
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
SQLite version has been updated to 3.7.7.1 since Qt 4.8. The version
number is corrected in licence document for 3rd party components.
Reviewed-by: Trust Me
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian Linuxification building case changes
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changes the libraries to match the case of files for building
Symbian in linux.
Reviewed-by: Miikka Heikkinen
|
| | |\ \
| | |/
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The example code only dealt with successful opening of the session.
If the session open failed, the application is stuck because the
connect button is disabled.
Moved the session open to be part of connection.
Handled session open failure by puttin the UI back in the default
state where connection button is enabled.
Task-Number: QTBUG-9909
Reviewed-By: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QAtomicInt has a constructor, so QBasicAtomicInt needs to be used
instead to allow compile time initialisation.
Task-Number: QTBUG-20343
Reviewed-By: Olivier Goffart
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Certain FTP servers refuse the SIZE command in ASCII mode (proftpd)
or refuse the SIZE command in ASCII mode for large files.
This is a security feature, as the SIZE command requires reading
the whole file and counting line ends which can cause denial of
services. In binary mode, the file size on disc is reported, which
is a relatively quick operation.
Qt had two problems here:
1. when size command fails, the total size was reported as -1,
whereas the documentation of QFtp::dataTransferProgress states
it should be reported as 0 (so that QProgressDialog can display
a wait note rather than progress bar)
2. SIZE command was sent before setting the type of the transfer
to ASCII / Binary. This is a problem as the size reported by
the server is incorrect. Also it usually means sending ASCII
SIZE for Binary transfers, which results in the 550 error on
FTP servers with DOS protection.
Task-Number: QTTH-1428
Reviewed-By: Peter Hartmann
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60StyleAnimation had a number of exception safety problems.
- Exceptions from QS60StyleAnimation/V2 could panic a TRAP harness.
- Pointers could be uninitialised on exception in constructor.
Problems solved by switching to QScopedPointer and simplifying the code.
Task-number: QTBUG-4871 incidental finding
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The call to topData() in ~QSymbianControl can create the required
object if it does not already exist. This can then throw an exception
if it fails, which is not allowed to escape the destructor. So it is
caught and ignored.
Task-number: QTBUG-4871 incidental finding
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a class derived from QObjectPrivate throws an exception in its
constructor, ~QObjectPrivate will be invoked with threadData being
null. This change tests for null before accessing threadData.
Task-number: QTBUG-4871 incidental finding
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | | |
All includes for private headers should have private directory info.
Reviewed-by: Shane Kearns
|
| | |\ \
| | |/
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian - fix compile error when default configured
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
New code assumed building with OpenGL/OpenVG, which is the
production configuration, but not the default configuration
Reviewed-By: Jani Hautakangas
Task-Number: QTBUG-21996
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.
Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems
for several people. Also, this leads to problems when using the binary
installer for development.
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QIODevice - disallow setTextMode when not open
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Calling setTextMode() before open() would make the device appear to be
already open and cause later errors.
Added a qWarning and documentation update to prevent this API misuse
Task-number: QTBUG-20905
Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 1435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix possible crash in glyph cache when deleting and creating contexts
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (29 commits)
Fix possible crash in glyph cache when deleting and creating contexts
Added Lithuanian translation of Qt.
Remove idc from mingw build.
Update changelog for Qt 4.8
Update changelog for Qt 4.8
Add the ability to enable various SSL bug workarounds.
Fix performance regression on Mac OS X when creating/destroying QMutex
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Symbian - Change working directory of applications in ROM
QtGui def file update
Show SaxBookmarks as maximized in Symbian
Early construction of status pane and softkeys for Symbian boosted apps
Maximized dialogs are incorrectly positioned after layout switch
Fix bug in QStringToBSTR.
Fix regression in ListView
Fixed resource leak when setting QProgressBar style sheet
Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac
don't lock the global mutex if there is nothing to protect
fix possible race conditions
simplify the code by using QSystemLibrary a bit smarter
...
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The freeResource(), used in the glyph cache as a notifier of when the
owner context of the cache disappears, is never called if the context
is in a group with other contexts that share its resources. This
implements a second notifier function instead which can be used to
invalidate the glyph cache when its context is destroyed.
Task-number: QTBUG-22324
Reviewed-by: Samuel
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix security issue on website due to bad JS.
Doc: adding link to the Qt Quick Components for Symbian page.
|
| | |\ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Symbian - Change working directory of applications in ROM
QtGui def file update
Show SaxBookmarks as maximized in Symbian
Early construction of status pane and softkeys for Symbian boosted apps
Maximized dialogs are incorrectly positioned after layout switch
|
| | | | |\ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Fix security issue on website due to bad JS.
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: Trust Me
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (110 commits)
Doc: adding link to the Qt Quick Components for Symbian page.
Update Japanese translations.
Updated Russian translation
Update Korean translations to 4.8
qmake: fix writing of incremental linker option for vcxproj files
support the obj-c #import statement in the dependency generator
runonphone timestamps nanosecond formating set to 9 chars, 0 padded
Put Qt translation files to rom on Symbian.
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
Fixes: libpng symbols exported from QtGui.dll on Windows
Converting from double to qreal in gui
Doc updates to installation, platform notes and symbian introduction.
Fix XML schema validation failure.
omit unassigned (and too recent codepoints) from the text Normalization process
purge "Translation Rules for Plurals"
add -list-languages option to lupdate
Fix construction races in QtNetwork
...
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / /
| | | | |/| | | | | | | |
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update changelog for Qt 4.8
|
| | | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ / / / /
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Doc: Fix example code
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Accepting predicted text using hardware keyboard replaces unwanted part
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Workaround to VideoCore III scissor bug.
Fix to QGLWidget crash
Update def files
Fix crash on exit when overriding signal handlers in states.
Typo fix
Add new signals to indicate GPU resource usage.
symbian - search drives for translation files
symbian - search drives for translation files
Cannot flick to the end of a horizontal list view width LayoutMirroring
Backport more imports directory caching changes.
Symbian - fix deleteLater not working from RunL
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Doc: Fix example code
|
| | | |/ / / / / / / / / / /
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Task-number: QTWEBSITE-281
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
|
