| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
Symbian: Fix qscriptextensionplugin autotest
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust me
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This stylesheet makes the Qt Reference docs look the same as the Qt
Creator docs.
|
| | |/
| | |
| | |
| | |
| | | |
This stylesheet makes the Qt Reference docs look the same as the Qt
Creator docs.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
Symbian: Fix qscriptextensionplugin autotest
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Symbian builds seem more strict about properly declaring exports than
other builds, so added proper exporting and importing to some
function declarations.
Task-number: ou1cimx1#957184
Reviewed-by: mread
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
SRCDIR was not defined at all in Symbian builds.
Task-number: ou1cimx1#957098
Reviewed-by: mread
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
No need to deploy "c:/windows/fonts/times.ttf" into Symbian devices,
as they already have that font by default. The code that loads this
file is only executed in WinCE, so it was never used in Symbian,
anyway.
Task-number: ou1cimx1#957049
Reviewed-by: mread
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: Fix qscriptextensionplugin autotest
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- Linking of static library needed to be explicitly stated in Symbian.
- Plugin deployment was added.
- Had to rename the simpleplugin in Symbian builds as the name
was too generic and was causing conflict in /sys/bin.
Task-number: ou1cimx1#956851
Reviewed-by: mread
|
| |\ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
selftests: eliminated usage of qttest_p4.prf
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
selftests: eliminated usage of qttest_p4.prf
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: Ib6f0a59fa54d1e002a05587362f95678c3b3fc26
Reviewed-by: Jason McDonald
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (29 commits)
Add dita_docs target to generate DITA output.
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix a bug where 'int' is not printed in snippets.
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
Fix m_longTapDetector causing crash.
Fixes to czech translation
Fix crash in positionInLigature
Fix to incorrect ApplicationActivate event in QtOpenGL
Symbian - Fix QFile::map with non page aligned offsets
Update czech translation
Symbian: fix tst_QMenuBar::task256322_highlight() regression
I18n: Updates galician translation (4.8)
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
Default to QDir::homePath() in Symbian native file dialogs
directfb: Backport the work from QtBase to Qt 4.8
[blitter] Work on tst_QPixmap::clear()
[blitter] Use QScopedPointer for the engine and blittable
[blitter] Generate a new serial number when resizing the
[blitter] Fix memory leak in the blitter paintengine
...
|
| | |\ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
Add dita_docs target to generate DITA output.
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix a bug where 'int' is not printed in snippets.
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
Fix m_longTapDetector causing crash.
Fixes to czech translation
Fix to incorrect ApplicationActivate event in QtOpenGL
Symbian - Fix QFile::map with non page aligned offsets
Update czech translation
Symbian: fix tst_QMenuBar::task256322_highlight() regression
I18n: Updates galician translation (4.8)
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
Default to QDir::homePath() in Symbian native file dialogs
Fix NTLM authentication with email address
Fix null pointer dereference in NTLM authentication
|
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The problem is that the coreservices configuration was not turned on due
to the fact that the configure test was never ran. This is because the
configure test was placed in the wrong platform section and would
actually be ran for QPA and not Mac.
Task-number: QTBUG-23302
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix crash in positionInLigature
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix crash in positionInLigature
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Check boundary of pos before accessing attributes.
Task-number: QTBUG-23104
Reviewed-by: Eskil
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
OpenSSL's SSL_ctrl() always took a "void *" argument as 4th parameter,
since at least version 0.9.7.
I have no idea why we had "const void *" in there.
Reviewed-by: Richard J. Moore <rich@kde.org>
Task-number: QTBUG-23132
|
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Add dita_docs target to generate DITA output.
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix m_longTapDetector causing crash.
Fix to incorrect ApplicationActivate event in QtOpenGL
Symbian - Fix QFile::map with non page aligned offsets
|
| | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix m_longTapDetector causing crash.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Forgot to amend commit before pushing, sorry.
Task-number: QTBUG-23252
Reviewed-by: TRUSTME
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
GL shared widget calls null poiter m_longTapDetector.
These call shouldn't happen because GL shared widget
isn't part of UI stack anymore. This patch adds null
pointer checks
Task-number: QTBUG-23252
Reviewed-by: TRUSTME
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix to incorrect ApplicationActivate event in QtOpenGL
Symbian - Fix QFile::map with non page aligned offsets
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QEvent::ApplicationActivate is sent incorrectly when application
goes to background if OpenGL graphics system is used. The problem
is that hidden global shared QGLWidget used by QtOpenGL for root
context is added to CONE stack. Qt destroys shared GL widget
when application goes to background and underlying CCoeControl
is removed from CONE stack which causes CONE to handle
stack changes. CONE tries to focus next control in stack which
causes incorrect focus events in Qt leading to
ApplicationActivate event. GL global share widget must not
be added to CONE stack because it's hidden utility widget
and don't belong to UI widget stack.
Task-number: QTBUG-23195
Task-number: ou1cimx1#946477
Reviewed-by: Murray Read
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Although it is not documented, RFileMap native API requires the offset
into the file to be a multiple of the page size.
Round down the offset requested by the user to the page size.
Add back the difference before returning the base address to the user.
e.g. if the offset passed to QFile::map was 5000:
The offset passed to RFileMap will be 4096
The address returned to the user will be the RFileMap::Base() + 904
The modified address is used to key the hash of file mappings, so that
QFile::unmap() can be passed the modified address without needing changes.
Reviewed-by: mread
Task-number: ou1cimx#953054
|
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix a bug where 'int' is not printed in snippets.
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-By: Trust Me
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes to czech translation
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: fix tst_QMenuBar::task256322_highlight() regression
|
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: fix tst_QMenuBar::task256322_highlight() regression
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This fixes Symbian-only regression caused by
ab0a2466d7e3998caad226197355b729f523764a.
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update czech translation
I18n: Updates galician translation (4.8)
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 1493
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Default to QDir::homePath() in Symbian native file dialogs
directfb: Backport the work from QtBase to Qt 4.8
[blitter] Work on tst_QPixmap::clear()
[blitter] Use QScopedPointer for the engine and blittable
[blitter] Generate a new serial number when resizing the
[blitter] Fix memory leak in the blitter paintengine
Fix NTLM authentication with email address
Fix null pointer dereference in NTLM authentication
|
| | | |\ \ \ \ \ \ \
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Default to QDir::homePath() in Symbian native file dialogs
Fix NTLM authentication with email address
Fix null pointer dereference in NTLM authentication
|
| | |\ \ \ \ \ \ \ \
| | | | |_|_|/ / / /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Default to QDir::homePath() in Symbian native file dialogs
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Symbian places restrictions on the directories in which the native file
dialog can browse. If the path passed to QFileDialog::getXxxFileName()
is inaccessible, the implementation defaults to a path which is
accessible.
Previously, this default path was QDir::rootPath(). Changes to the
Symbian file engine in Qt 4.8 mean that this now returns "C:\" which is
inaccesible to the file dialog. This patch changes the default path to
QDir::homePath(), which returns "C:\data".
Task-number: ou1cimx1#947939
Reviewed-by: Miikka Heikkinen
|