| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
| |
This fixes Symbian-only regression caused by
ab0a2466d7e3998caad226197355b729f523764a.
Reviewed-by: Miikka Heikkinen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using "user@dns-domain" for NTLM authentication, the whole string
should be sent as the username, and the domain should be set to an
empty string.
The domain sent by the server is still reflected if the username
does not contain an '@' character.
Manually tested using MS IIS on a domain-joined PC.
Task-number: QTBUG-19894
Task-number: ou1cimx1#949951
Change-Id: Ie1f81172e71cb7cce7b8c909062be990c24aea47
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit f74ff46c7a333d771b07d8ff38df10d9fd13bbcf)
|
| |
|
|
|
|
|
|
|
|
|
|
| |
If NTLM authentication is required for the URL with an empty path,
then QNetworkAuthenticationCache::findClosestMatch(url.path()) returns 0.
e.g. "http://10.1.2.3".
Return a default constructed credential in this case.
Change-Id: I84ad3b308ee3f74fbbac9ad0f11dbdc66047b50b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit b830c9cededf995fab1b0919a81658ceaec8d422)
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 8752faf0564bed86396b01529dc8ef5064150f4c.
Also Revert "Fix def files"
This reverts commit d2a3b9ee8c9329cac96b5e509df0e6a69dbef91c.
This was found to cause a crash in QMLGallery app.
It is not necessary to delete these resource pools at app
exit, as the OS should automatically release the resources
at this point.
Reviewed-by: Jani Hautakangas
|
| |
|
|
|
|
|
|
|
| |
QtOpenGL uses 16-bit configs by default but on Symbian
it should use 32-bit config.
Task-number: QTBUG-23082
Task-number: ou1cimx1#951223
Reviewed-by: Murray Read
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The selected text replacement was done incorrectly, leading to removal
of additional text equal to the lenght of the original selection.
Fixed by not doing any explicit replacement, but instead faking a
preedit character that is immediately removed, which triggers selected
text removal in the input method handling of the underlying edit
control.
Task-number: ou1cimx1#938665
Reviewed-by: Sami Merila
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a QWaitCondition was deleted while it was waiting, it would crash in
the wait() function while trying to use its internal mutex. This crash
is not particularly obvious in its cause.
QWaitCondition can detect this delete-while-waiting case, issue
appropriate warnings and avoid a crash in its internal state.
In the app crash case where this problem was found, there is a further
crash after this one due to an externally deleted mutex. The app is
clearly at fault. But at least there's now more debug info about
what the app is doing wrong.
Task-number: ou1cimx1#946509 partial fix
Reviewed-by: Shane Kearns
|
| |
|
|
|
|
| |
This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.
The mentioned fix has caused failure in qtcreator. Thus it has to
be reverted and new fix for the memory leak will be made.
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Correct client rect calculation for MCL
Symbian: Fix CBA display on application with multiple windows
Fix def files
doc - document symbian behaviour of QFile::link
Symbian - prefer sessions started by this process to choose proxy
Freezing Def files in Qt
Lightmaps demo Symbian fix
CBA comes on top of option menu
Fix memory leaks in OpenVG and OpenGL resource pools
Fix sqlite driver memory eating due to close failure
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
QSQLITE support only one statement at a time
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove more "unused variable" warnings
QTreeView: fix crash when starting a drag with hidden columns.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Frederik
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Crash was introduced by d639105759491 (Qt-4.8 only)
Amended to remove "unused variable" warning.
Task-number: QTBUG-15834
Merge-request: MR-2725
Reviewed-by: Gabriel
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix stack overwrite in QDBusDemarshaller
Qt Linguist: Fix crashes
fixed error generating wrong introspection string in header output file
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QDBusArgument extraction operators and QDBusDemarshaller that implements
the extraction do not check the type of the extracted value.
Helper function template qIterGet in qdbusdemarshaller.cpp that is used
for extracting basic data types only reserves space from the stack for
the expected type as specified by client.
If the actual type in the DBus parameter is larger stack will be
overwritten in the helper function by at most 7 bytes (expected one byte,
received dbus_uint_64_t of size 8 bytes).
The fix always reserves space for the largest basic type dbus_uint64_t
readable by dbus_message_iter_get_basic API.
See also http://dbus.freedesktop.org/doc/api/html/group__DBusMessage.html#ga41c23a05e552d0574d0444d4693d18ab
PMO 280456
Task-number: QTBUG-22735
Merge-request: 1469
Reviewed-by: thiago
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Backport SMP safe initialisation of QNetworkConfigurationManager
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The original commit in Qt5 uses new atomics API that is not
in Qt4. I have replaced with equivalent calls.
Also the init/cleanup functions are different, so those are renamed.
Reviewed-by: mread
Task-number: ou1cimx1#946677
Original commit message follows:
Author: Thiago Macieira <thiago@kde.org>
Date: Wed Jul 6 00:06:15 2011 +0200
Fix the QNetworkConnectionManagerPrivate initialisation code.
The current code was meant to be a thread-safe initialisation that
also ran a couple of extra steps. But it wasn't. While it's ok to call
qAddPostRoutine(), the call to updateConfigurations() was
thread-unsafe. It is possible that another thread got the pointer to
the Private before updateConfigurations() finished.
So instead protect the initialisation with a mutex.
It's possible that the value of the pointer becomes visible to
other processors before the other contained values, so use
atomics here.
To call qAddPostRoutine safely from the main thread, use the trick
of deleteLater() (which is thread-safe) in another thread connecting
to a slot.
|
| | |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian def-file
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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.
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | |\ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
The scenario was this:
If you had a height for width item, and that item had a maximum
width of 50.
If you called
item->effectiveSizeHint(Qt::PreferredSize, QSizeF(100,-1));
it would return (100, ?), thus violating its own maximum width.
Merge-request: 1423
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
We only updated the MWM_FUNC_RESIZE when the window was shown.
The consequence was that if the widget was initially shown in fixed
size it would clear the MWM_FUNC_RESIZE flag, and we would never
set it again if the widget became resizable later.
Some window managers still support this (apparently it seems that
compiz tried to adhere to this)
Task-number: QTBUG-21914
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
On Symbian, QML apps had no way to disable GL multisampling if the
hardware supported it. This caused some apps to run out of graphics
memory and fail.
This change adds a way for apps to indicate that they don't want
multisampling, by setting an environment variable. For example:
qputenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE", "1");
This non-public API style was used as the use case is platform and
application specific, and not appropriate for public API.
Task-number: ou1cimx1#947771
Reviewed-by: Gareth Stockwell
|
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
QSqlRelationalTableModel doesn't follow relations on the first column
of a table. The DisplayRole and the EditRole for indexes on column 0
are always the same. The bug is found in QSqlRelationalTableModel::data.
Task-number: QTBUG-20038
Reviewed-by: Charles Yin
|
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
The file was being exported using both prj_exports and deployment
lines. As deployment is copying to epoc32 z and c directories, the
prj_exports is not needed.
Moved the prj_exports rules into the S60 5.0 section, where deployment
is not used but rather explicit rules added to the sis file.
Task-number: ou1cimx1#946574
Reviewed-by: mread
|
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
The clientRect calculation was adjusting the rectangle for the status
pane. But this is now taken into account in the rectangle from Avkon,
so we do not need to adjust when the status pane is there.
However Avkon is supplying an inconsistent clientRect depending on
whether we have all Avkon panes disabled (status pane and CBAs).
When enabled, Avkon takes the splitview keyboard off the clientRect
space, when disabled, Avkon ignores the splitview keyboard. Since we
want to ignore the splitview keyboard effect on the clientRect, we
only adjust when the Avkon panes are enabled.
This has been tested with splitview keyboard, orientation change and
debug output of the client rectangle returned in the following
situations:
- Normal app with status pane and CBA
- App with CBA but invisible status pane
- App with status pane and CBA disabled
Task-number: ou1cimx1#938780
Reviewed-by: Miikka Heikkinen
|
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
If an application has more than one window and each window has widgets
that can receive focus, sometimes a situation happened when the last
focused window isn't actually the window that contains the current
focused widget, which led to displaying incorrect CBA. Changed
CBA displaying evaluation to be done whenever any control is focused
instead of just windows.
This can add a couple of extra S60->setRecursiveDecorationsVisibility()
calls to some applications, but since that is typically already called
multiple times anyway, it shouldn't be an issue.
Task-number: ou1cimx1#935663
Reviewed-by: Sami Merila
|
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
Reviewed-by: TRUSTME
|
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
Task-number: ou1cimx1#943243
Reviewed-by: mread
|
