| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
| |
Backport of 2d5a4a5d3aae4efe7c17cadf03dfbb5cc4c36e86 from qtbase.
Change-Id: Id8453fdd40c88acd27f2ddd932a5a410382e1b67
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Iecd72971c2cb825cfb4d1ab3c0110feb9df1f854
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
no point in it
Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)
|
|
|
|
|
|
|
|
| |
we rely on a syncqt'd tree anyway
Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)
|
|
|
|
|
|
| |
Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
|
|
|
|
|
|
|
|
| |
saves us some pointless code
Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
|
|
|
|
|
|
|
|
| |
it was masked by the precompiled header
Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2b969b89b95317f04bd562aee3528cab227e57b8)
|
|
|
|
|
|
|
|
| |
it doesn't serve any puropse (any more?) and it breaks the mingw build.
Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)
|
|
|
|
|
|
|
|
|
|
| |
This change factors out common configuration for Linux ARM targets
into a subsiduary mkspec which is included by linux-g++-maemo.
Cherry-picked from qtbase commit 3f09c6a1762db9ea05f3815235ac0937d004ee9e
Change-Id: I9d7852e8b2e891217c3bee2964cddfef526d1d5f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add XButton1 AND Xbutton2 to the list of accepted Buttons.
This is only a doco fix, without any code change.
On branch 4.8
Change-Id: Ib396ec7707a63123759f1164927f0b63850cebe9
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Plugin is now moving QIODevice pos to 0 before
exiting from canRead function, so it doesn't break
other existing imageformat plugins functionality.
Task-number: QTBUG-24201
Change-Id: Ib58b0458215cf5ad705dffa0aaf6a7463d1f089e
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Calling peek() for qsslsocket caused socket data to be copied into
qiodevices buffer and therefore make it unaccessible in qsslsocket.
Task-number: QTBUG-18498
Change-Id: Ie27a90a468be8158bd8afcd259dbb34483623c36
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Original description for bugfix:
Fix bug showing folder icons for files
Fix an issue where the cache was updated with the folder icon,
even though this is never used from the cache. This caused
files to sometimes be shown with a folder icon: If a folder
has an extension (e.g. a folder named 'folder.ext'), this
means the folder icon will be written to the cache for the
'ext' extension, and from that point on all .ext files will
be shown with the folder icon.
The fix is to not save an icon in the cache for those cases
where it will not be used from the cache anyway, by using the
same condition for updating the cache as for reading it (which
is in line 8 of the same function).
Change-Id: I349526ff017b1a2409e3dcc494b86bb541740790
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It consists of 2 fixes:
1. JavaScriptCore fix is relevant to changed ctor of the std::pair in
C++11. Due to that change some code has been broken. Fix makes using
std::pair compliant to both standards
2. Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.
Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Kervala <kervala@gmail.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This function returns true if the item (or, in case it's a focus
scope, one of its children,) has focus (i.e., will
receive key events now), or will receive focus once the scene is
activated. It also returns true if the item has not yet been added
to a scene, but has subFocus, implicating that someone has called
setFocus() on it prior to it being added to the scene; the latter
case seen most commonly in unit tests.
Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1
Task number: QTBUG-24681
Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
| |
The links were still pointing to old URLs, this change changes the
links to point to qt-project.org
Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763
Reviewed-by: Jerome Pasion <jerome.pasion@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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
An implementation of the Symbian fast allocator was added to Qt
before it was available in all Symbian devices, to allow Qt
the benefit of it in all installations.
Now it is available in all Symbian devices and there is no
need to keep a copy in Qt. So it is being removed to simplify
the code.
Task-number: ou1cimx1#946699
Change-Id: I937faca61beb4ef66a858766ebfa3deff564c786
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Symbian text codec is creating a CCnvCharacterSetConverter with its
NewL() function. This requires the CleanupStack, otherwise you get a
E32USER-CBase 69 panic. But sometimes apps have been using text streams
and other objects in static data construction or destruction which
use the text codec where there is no CleanupStack.
This change detects is a CleanupStack is present and temporarily creates
one if not.
Change-Id: Ia68fa60b4f0e3d675ee302208a625c6e9493a6f1
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise, you don't have any socket engine handler created when
directly setting a proxy to a socket.
Cherry-picked from Qt5 / QtBase commit:
92659bacda53da782c84dff44d3caa2590dbc7cc
Change-Id: Id87a13cf496553e85ca1f92f0cb5093752f3f5f5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qvfb fails to compile on linux.
Fixed by removing duplicate source and header file inclusion from
qvfb.pro file when embedded flag is not set in CONFIG.
Task-number: QTBUG-19804
Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
| |
Although the code for processing a sysroot was already present,
the -sysroot command-line option was ignored.
Change-Id: Idde473d4b5f9cf3d56b508c71614d4cbc0248492
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The q and d pointers were not used in these functions at all, or they
were used only inside some #ifdef quard such as QT_NO_ACCESSIBILITY.
Moved the Q_D and Q_Q macros inside the appropriate scope.
Task-number: QTBUG-22512
Change-Id: I1624a1d800c7ce21cde4af1678d93e6f615edd45
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
WEC7 does not have ptrdiff_t outside std namespace, switched to use
ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in
operator[].
Task-number: QTBUG-22502
Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
|
| |
There were some qdoc errors when generating the qdoc manual. This change
fixes thoise qdoc errors.
Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
|
|
|
|
|
| |
Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
|
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase 4560ea230f40
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Change-Id: I06fc265fcc34bcc671c44b7041c0c461e588d193
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
q_atomic_decrement and q_atomic_increment did not set return value
correctly. They expected the %eax return value register to be empty,
when it was not necessarily so.
This could occur when when compiler inlined e.g.,
~QByteArray -> QBasicAtomicInt::deref -> q_atomic_decrement
chain to application code. Data would not to be freed and leak memory.
Fixed so that %eax is now zero'd before setting return value.
Task-number: QTBUG-24470
Change-Id: I83495e3ddb938713863a7b00714215c331b9562b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
| |
Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
| |
The function wasn't introduced in 4.8, we just documented its
behaviour properly in that release.
Change-Id: I0560be978612eaed4e632ea191c4b2ba19b4e7a8
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|
|
|
|
|
|
|
|
| |
If the seek position matches the current file position, then
avoid doing an implicit flush that could be expensive.
Change-Id: I019858ffb36fe832b9aee8da0a7803cafc8f7f75
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
just empty
Considering a subtable to be invalid when it was empty meant that it
returned an error causing all further hinting to be aborted. This means
that we get no hinting in certain cases with certain fonts.
Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-24505
Change-Id: Icec4d2c06175e29c5995399d0584c1ca76dc39d2
Reviewed-by: aavit <qt_aavit@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When an aggregate function is used for a column in a SQL resultset then
it should ensure that the right data type is reported for that column.
This also concerns expressions when the returned column does not map
directly to a table column.
Test included for this.
Task-number: QTBUG-22038
Change-Id: I681297accc979081d14b44d190ab9d5f83aac215
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
(cherry picked from commit 678ab52ccba0b6a6903e9aee404dbe84fb74c91d)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Hang onto the screen index that this widget should be
placed on in case the platform cannot move the window onto the screen yet,
when window is not yet created and the plugin cannot access the topData
to update the screenIndex. When this variable is later referenced
after the window is created, it defaults to screenIndex 0,
so the window is never moved correctly.
Change-Id: Ica78fd90aa3dacc29f81b2f6bd6c8b45d2fb2961
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
| |
Change-Id: Id65798b81db2fa9fb5b1d929e4a94103995c6707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase 657f634c0e8a1bf4f544b
Change-Id: I35cbdd6fa947a98a6afa70bdc72631c4213c288a
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
| |
The wrong macro logic was causing iconv_open to never be
called under QNX.
cherry-picked from qt5/qtbase 8a15c41d36b1905a2
Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building for the QNX/x86 target, we forgot
to add the 'qnx' tag to CONFIG. This causes
failures when third-party libraries using qmake
try to scope on qnx.
This change mirrors what's in the ARM target.
Change-Id: I28e1df4d8636385c5555a2bb4087d26a8a9b4220
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rather than requiring specific hardcoded proxies in the system,
it now checks the proxies returned by the system have the required
capabilities for the request.
Note the test will pass if no proxy is configured (as
QNetworkProxy::NoProxy has all required capabilities)
The test prints the returned proxy lists and elapsed time
diagnostic for manual comparison and debugging.
Change-Id: I621ef4d1d7264a98c3e8bd485c30bc1166fcbdf0
Task-number: QTBUG-19454
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 3c529933612ff022d139975d661e37c77b1b2e99)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If both "automatically detect settings" and "use automatic configuration
script" are selected in internet options, then respect that.
Because of performance issues, these are tried separately, and
disabled if they fail.
Task-number: QTBUG-13957
Task-number: QTBUG-10238
Change-Id: Ibc824d3039afeaf12c5ea82ed95287e5cf4e1776
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit 4cc8209998c386a4372f10496f0c97f3d86f92bb)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TcpServer requests always returned no proxy, even if socks was available
Tag handling was broken for empty tag (if system proxies were tagged)
Tag handling was broken for unknown tags - now handled the same as if
no tag was given at all.
When there are different proxies for http and https, windows returns
the http proxy first. However we should prefer to use the https proxy
for general sockets, as it's more likely to support the CONNECT method.
Change-Id: I55dcadf2e142367e857f94e55fdbb0c4ddb513a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit ea92d02b6ba873c10153dc6ab7472edf07f99f03)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If both manual proxy settings are configured and the autodetect
setting is enabled, fall back on the manual configuration when
auto detection fails.
Task-number: QTBUG-10428
Change-Id: If008c7c967eec6256ce3c614fff0ec258190d451
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit 276f64d21d7b877044fddd646b855829950099b0)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The PAC file may result in direct connection, in which case
WinHttp returns null strings for the proxies and the connection
type marked as direct.
In this case, return the default list (no proxy)
Change-Id: I601033f56a841bb92ea80a28174bb993b024ad79
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 25c05ce3bb8b53ed937363492b8222ee3b83d749)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the windows internet options are used to specify a
different proxy for each protocol, assume the proxy server type
matches that protocol too.
e.g. "socks=qt-test-server:1080" is both tagged for socks, and
assumed to be a socks server.
"ftp=qt-test-server:2121" is assumed to be an ftp proxy
"ftp=http://qt-test-server:3128" is overridden to be a http proxy
used for ftp.
Task-number: QTBUG-10502
Change-Id: I70615c89d6ede53f0e7d62e6d0754b90d042aa2e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit a7489b2ba3f2f3ea28d6fff0c835c12b0666af45)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
| |
Loser of the race would try to delete an uninitialised pointer
Task-number: QTBUG-15765
Change-Id: Ie184ee2306e102aa8fbad752ef09b95c3ede00c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2cf8e487a5c546382daaa954c23d3926668b0a85)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The mask of possible mouse buttons in QNX provides tracking for the
up/down State of up to 8 mouse buttons. This update adds support
or 2 of buttons which we previously ignored in Qt on this Platform.
Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase
reduced to the 5 buttons Qt4 has support for
Related to task-number: QTBUG-24682
Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Event driven listening for navigator events, basically a backport of
the respective QPA plugin code in Qt5/qtbase
Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
| |
Change-Id: I7d22d48b189e8abfd6164a51b1e025360ef3da5a
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
| |
cherry-picked from Qt5/qtbase 4ba895a86
Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|