| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QNotifyChangeEvent was being used by QSymbianFileSystemWatcherEngine,
but it also helps in the implementation of new plugin watching for
QTBUG-20098. So it has been generalised to work with an interface and
any class that implements that interface.
The Qt file system watchers could not be used in QTBUG-20098, as they
will not watch for currently non-existing directories.
Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
|
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
If user changes focus from one item to a new one while the splitview
keyboard is open, the newly focused item is not connected to the
translate() slot. Thus, the item will not be kept "automatically"
visible above the keyboard when cursor position changes.
QCoeFepInputContext now holds a pointer to the last focus item and
disconnects the previous focus item from slot when new focus item
is set. Ensuring the visibility of the focus item needs to be done
asynchronously after reset() has been called from graphics scene,
to ensure that new focus item has been set.
The translation rules have been tweaked to support translation to
both directions (up|down). Previous implementation worked properly
only for upwards translation (new cursor position was assumed to
be lower than the existing one).
Task-number: QTBUG-21611
Reviewed-by: Miikka Heikkinen
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix building against older Symbian^3 environments
Fix QTextBrowser autotest to use "file" scheme in URLs.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
R_AVKON_DISCREET_POPUP_TEXT_COPIED is missing from some older Symbian^3
environments, so define it explicitly. Also do not attempt to show
the popup unless running against newer versions.
Reviewed-by: Sami Merila
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
A security fix to QUrl that causes it to no longer interpret URLs
without scheme as local files broke QTextBrowser test case. Added the
necessary "file" schemes to URLs used in the test.
Also added a mention about necessity of using "file" scheme to
QTextBrowser documentation.
Task-number: QT-5286
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix QXmlQuery autotest failure.
Lower case as default in password entry in Symbian port.
Fix for QTBUG-18050: QXmlQuery crash
fix for QTBUG-18050: QXmlQuery crash
|
| | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Changed XQuery functions fn:doc() and fn:doc-available() to work with
URLs without scheme when accessing files.
Task-number: QT-4962
Reviewed-by: Honglei Zhang
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
The text case "Abc" is removed from the permitted cases because
passwords are rarely sentences but random characters.
Task-number: QTBUG-10312
Reviewed-by: Shane Kearns
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
src/xmlpatterns/api/qxmlquery.cpp
|
| | | | | | | | | | | | |
|
| | | | |/ / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If QXmlQuery has a previous focus and an invalid xml is given
in setFocus, the old focus must be cleared. Otherwise the query
may be left in an inconsistent state.
Task-number: QTBUG-18050
Reviewed-by: Miikka Heikkinen
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix plugin implicit loading when calling QPluginLoader::instance().
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QPluginLoader::instance() didn't increase loading refcount if another
QPluginLoader had already loaded the plugin. This meant that if the
another QPluginLoader subsequently unloaded the plugin, the instance
would be destroyed even if the second loader still wanted to use it.
Also improved the tst_QPluginLoader::deleteinstanceOnUnload() test case
to test more combinations of deletion order and explicit/implicit
loading.
Task-number: QT-5259
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian - perform some FS initialisation previously done by open c
symbian - Document behaviour of QDir::rootPath / homePath
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
When using Qt 4.6 and 4.7, the working directory is set to the same
drive the application is installed on by the open c library.
The default working directory in symbian is always the private
directory on the system drive, but we told people to rely on the
open c behaviour.
Open C also creates the private path on both the system and
installation drives when the application is started.
This behaviour is also replicated now in Qt 4.8 for backward
compatibility of apps that may rely on it.
Similar code to create the private path on the installation drive
in QCoreApplication::applicationDirPath() has been removed, as the
new code in this patch is always executed first.
Task-Number: QTBUG-21527
Reviewed-By: mread
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
The root path was intentionally changed to reflect the real
drive root, while home path continues to reflect the user
data directory.
Task-Number: QTBUG-21527
Reviewed-By: Miikka Heikkinen
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
The cursor can get offscreen in splitscreen landscape mode
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
When input context is making the translation, it doesn't check if
the translation is happening to the correct direction (i.e. upwards
or downwards).
As a fix, check if the cursor is still visible after making the
translation. If it isn't apply the translation to the other direction.
Task-number: QTBUG-21543
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
support the obj-c #import statement in the dependency generator
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-21965
Reviewed-by: joerg
|
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / /
| |/| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Update 4.8.0 changelog
Changelog: update changes-4.8.0 for Richard
Add briefs for the new 4.8 examples.
Add briefs to the new 4.8 demos.
Add a brief to all demos and examples for manifest
|
| | |\ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (213 commits)
Doc updates to Qt for Symbian installation instructions and platform notes.
Doc updates to platform notes document.
Fix accessible menu not returning child name.
Fix broken qglthreads autotest build on Solaris.
Doc updates to platform notes of Qt 4.8 doc.
Disabled activeqt/webbrowser example from mingw build.
Don't store the alignment attribute for spacers
Doc updates to Qt 4.8 platform notes documentation.
Update changelog for Qt-4.8.0: add QtWebKit notes
Update changelog for Qt 4.8
Fix broken Solaris build (getpwnam_r usage)
Improve sbsv2 whatlog support.
Sentences should end with a period! (Poor man's rebuild trigger.)
Update changes-4.8.0 file
Modified SymSQL documentation in sql-driver.qdoc according review comments
Added correct licence headers to symsql source files
Documentation modifications for SymbianSQL added into sql-driver.qdoc
Release Symbian SQL driver
Fixed a typo found by static checker
Added SQL driver plugin implementation for Symbian.
...
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Update 4.8.0 changelog
Changelog: update changes-4.8.0 for Richard
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Add briefs for the new 4.8 examples.
Add briefs to the new 4.8 demos.
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (26 commits)
Add a brief to all demos and examples for manifest
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
don't crash when destroying the shortcuts
Doc: added since tag to QDateTime::msecsTo
QSslCertificate: blacklist fraudulent *.google.com
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
...
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
Fixed broken window surface flush when depth is 24 and bpp is not 32.
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
omit unassigned (and too recent codepoints) from the text Normalization process
Fixed broken window surface flush when depth is 24 and bpp is not 32.
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.
see http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability for details
we should respect that the QChar::Unicode_Unassigned == 0
and thus less than any other QChar::UnicodeVersion value
Merge-request: 952
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Some X servers use a compact representation of 24 depth visuals. In that
case we can't use the shared memory or XPutImage paths, as Qt's RGB32
does not match the internal memory layout.
Also fixed QPixmap::fromImage() to work in this case to prevent the red
and blue channels from being swapped.
Task-number: QTBUG-21754
Reviewed-by: Alberto Mardegan
|
| | |/ / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
The upgrade of the bundled libpng to version 1.5 had the side effect
of causing the png functions to be exported from the QtGUi DLL
when built with the MS Visual C++ compiler.
Task-number: QTBUG-21455
Reviewed-by: Kim
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Do not let QGLContext get out of sync when doing mixed VG-GL rendering
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
symbian - add support for ELangKazakh and ELangEnglish_India
QAuthenticator::setUser() parse user name in form user@domain
A patch for 'Fix to QtOpenGL crash'
Update Korean Translations
Document updates to Qt for Symbian installation instructions and platform notes.
Always recreate backing store when TLW transparency changes
Crash in QDeclarativeCompiler::indexOfProperty
Fix to QtOpenGL crash
Incorrect 'break' in switch-case was replaced by 'return'
QLineControl: selectedTextChanged() signal is omitted in some cases
QML import path puts Qt dirs in correct Symbian order
Avoid runtime warning about interlace handling from libpng 1.5
symbian bearer: fix tst_qnetworksession test failures
Refactor dangerous multiple inheritance
Fix RConnection handle leak in symbian bearer plugin
Prevent crash when cache is changed on the fly
Add missing checks for httpReply in QNetworkHttpBackend.
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Do not let QGLContext get out of sync when doing mixed VG-GL rendering
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
The default graphics system is openvg, this means that apps using
QGLWidget (despite the official recommendation), without explicitly
setting opengl as the graphics system will use both the openvg and
opengl modules to perform rendering. This presents some problems
because QtOpenGL's comes with its own wrapper over QEglContext,
and making a foreign QEglContext (e.g. from VG) current will cause
its state to get out of sync, resulting in various drawing issues
due to skipped makeCurrent and similar calls.
The patch works this around by querying the current context from
EGL in QGLContext::currentContext() and returning null if the
EGLContext does not match. This somewhat ugly workaround ensures
that at least QGLContext::currentContext() will not lie: It will
not return a valid pointer when the underlying QEglContext's
underlying EGLContext is not actually the current context. This
will allow e.g. QGLPaintDevice::beginPaint to correctly recognize
the need for making the GL widget's context current and thus
avoid various rendering issues in certain games.
Task-number: QTTH-1553
Reviewed-by: Jani Hautakangas
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.
Task-Number: QT-5304
Reviewed-By: Martin Petersson
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
QHttpNetworkReply was waiting for a body to be sent for 401 and 407
responses, whereas with a HTTP HEAD request, there will be no body.
This delayed the authentication signal until after the http channel
is closed by the server after a timeout. For example with the server
used for autotesting, the authentication signal is delayed 15 seconds.
When the server has a very long timeout, the authentication signal may
not be emitted at all.
Task-Number: QT-5304
Reviewed-By: Martin Petersson
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
symbian - add support for ELangKazakh and ELangEnglish_India
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
I have not cherry picked this from 4.8 because it's tied up with a
feature implementation that refactored the code somewhat.
Task-number: QT-5298
Reviewed-by: mread
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QAuthenticator::setUser() parse user name in form user@domain
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Task-number: QTBUG-19894
Change-Id: I063dbc66e5f47a83cc1c0aee8913062b4b5e42bc
(cherry picked from commit d3313bc2f095dc15718b2a1ed613489ab1ae0927)
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
A patch for 'Fix to QtOpenGL crash'
Always recreate backing store when TLW transparency changes
Crash in QDeclarativeCompiler::indexOfProperty
Fix to QtOpenGL crash
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
EGL API was used also on non-EGL Symbian platforms
which generated compile errors when compiling Qt
on those platforms. This patch #ifdefs EGL usage
correctly for EGL enabled platforms only.
Reviewed-by: TRUSTME
|