| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
WebKit will not build unless the mentioned variable is set.
RevBy: Aleksandar Sasha Babic
(cherry picked from commit 4817debee23a72f44eedbb8f33b6b611b5161174)
|
|
|
|
|
|
|
|
|
|
| |
The Intel Compiler inlined the destructor of QObjectPrivate too
agressively, causing it to generate a call to ~QObjectData for QtGui.
~QObjectData is not exported from QtCore, so it failed linking.
Task-number: QTBUG-5145
Reviewed-by: Alexis Menard
(cherry picked from commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The built-in eval() function bypasses the script registration
performed by QScriptEngine::evaluate(), so if we get an
atStatement() callback from JSC from that script, the
scriptID-to-sourceProvider lookup will fail.
In this case, just return from atStatement() without delivering
the positionChange() callback to the QScriptEngineAgent, since
the agent will not have received the scriptLoad() callback for
that script anyway.
This is a change in behavior from 4.5, but we consider it
the minimum-impact fix at this point to keep 4.6.0 from
crashing. The only downside is that debugging will
effectively be "disabled" for the script passed to eval(),
but that's a lot better than crashing.
Task-number: QTBUG-6108
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)
|
|
|
|
|
|
|
|
|
| |
On Windows CE the native menubar must not be used.
The corresponding flag was never set for Windows CE.
Task-number: QT-2530
Reviewed-by: Maurice
(cherry picked from commit cda63c368dbb5acd040e2190db8f25de69462d8e)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The check, introduced in c66de8a19b558e14097c402480eeabf0b5ec2351,
changes behavior and it is not clear whether we should prevent
mmaping beyond EOF. FWIW, python prevents it.
Leaving a warning in there for now so as not to break applications that
depend on the feature.
Task-number: QTBUG-6008
Reviewed-by: Thiago Macieira
(cherry picked from commit 095c92f03e0c01b878eaa0cd1b7844171ce9241f)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When processing the result of QIODevice::readLine, forgot to take into
account that a '\0' is appended to the array. The terminating character
is not accounted for in the number of bytes returned.
By pre-allocating a byte for the terminating null character, we make
sure we'll actually read 16k bytes on each and every iteration.
Task-number: QTBUG-6019
Reviewed-by: Thiago Macieira
(cherry picked from commit b7692016f282251002b3e85dfcb5567bd91a12c0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All the examples/demos that used a QGraphicsView with a QGLWidget
as a viewport, that had multisampling enabled, was broken after
7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented
QGLWidget will be forced to use the parent widget's visual, which in this
case does not contain any multisample buffers. The QX11Info structure
for QGLWidget is put together based on the QGLFormat that is passed
into the QGLWidget constructor and will in most cases always be
different from the parent widget visual.
Task-number: QTBUG-5998 and QTBUG-6003
Reviewed-by: Eskil
(cherry picked from commit 5cf6f6276a3a9103876937c300c1adce157eebeb)
|
|
|
|
|
| |
initialization process creating window handles.
(cherry picked from commit b752acf1805eebd64e7e833862690e9ebdb714e3)
|
|
|
|
| |
(cherry picked from commit 51b3c2e652578f5577c07c22e177699d345c1dd7)
|
|
|
|
|
|
|
|
|
|
|
| |
The action performed by the latest drag and drop operation is stored in
the global DnDParams structure. The QDrag::exec() return value has to be
fetcted from this global variable instead of the temporary copy on stack.
Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this.
Task-number: QTBUG-6001
Reviewed-by: Denis
(cherry picked from commit a222302ca45e33306dacae0aa16a572c13abc483)
|
|
|
|
|
|
| |
Reviewed-by: Olivier
Task-number: QTBUG-6004
(cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)
|
|
|
|
|
|
|
|
|
| |
Configure complains about "Could not retrieve
HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only
try to do that for Symbian builds.
Reviewed-by: Lincoln Ramsay
(cherry picked from commit 7e7e3c3fe15780aa7d024e136acaf697ab49458c)
|
|
|
|
|
|
|
|
| |
Added "best practice" page on HW acc for mebedded. Modified HW acc docs. Adding Hello GL ES for Wince to the list of examples.
QTBUG-5791
David Boddie
(cherry picked from commit fbbdf8698fb0444d5170b7d0a14e870ea789398f)
|
|
|
|
|
|
|
| |
"This cannot happen" ... yeah, right. :}
Task-number: QTBUG-5989
(cherry picked from commit 7367a12c4a0d7686b9d35778e5de33a463504d75)
|
|
|
|
|
|
|
|
|
|
| |
Commit ecc202c introduced the regression while fixing another
regression (QTBUG-5854)
The selection would not expend to the whole viewport.
Reviewed-by: Robert Griebl
(cherry picked from commit 73153fa5288e22d27f26d0e1045e82698c9a6343)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some S60 SDK has a bug which make mifconv to crash with absolute paths.
Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of
using join of ICON keywords. Joining is not needed anymore since ICON
keyword supports only one filename. Using input variable
(QMAKE_FILE_IN) also esnures that absolute path is converted to
relative before invoking mifconv.
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 745db3d1b9a149910dcaa3c65aabab020eefa027)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With SBSv2 toolchain only first file from ICON keyword is used and
it is actually the right behaviour. Originally support for multiple
files in ICON keyword was introduced to support localized application
icons. However, in that case the different localized icons should not
go to same MIF file since it is not possible to define in .rss file
which icon number should be used for which language.
To support a localized application icons separate MIF for each locale
should be created and installation of ICON should depend on selected
language. Implementing proper support for localized icons is left
for another task.
Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 6c6661041fa3dfe7a8915ee1d27443b2ced179de)
|
|
|
|
|
|
|
|
|
| |
ICON keyword can be used without UID, since .mif filename
is generated based on target instead of UID3 nowadays
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 05e956d5c7d5c39bee332972ce54fea71c15d24b)
|
|
|
|
|
|
|
|
|
|
| |
This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.
Task-number: QTBUG-4745
Reviewed-by: TrustMe
(cherry picked from commit 4e4a800574a28a441858f95021d9092aa3001491)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change makes it possible to define ICON keyword in pro file
without UID3.
It is safe to use target as an icon name since Symbian devices cannot
have two different binaries with the same name as all binaries are
located in \sys\bin. This means there cannot be also two mif files
with same target name. Also all native S60 apps use target name as an
MIF basename. Target name is also much easier to associate with app
than UID.
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 952f0ca3f371b040bd8b8a007cdf87bf0e4843ad)
|
|
|
|
|
|
|
|
|
|
| |
When a pixmap's contents change in QVGPixmapData, only recreate
the VGImage in the GPU if the size is different than before.
This should help reduce GPU memory fragmentation.
Task-number: QT-2504
Reviewed-by: Sarah Smith
(cherry picked from commit a8c8c2274d2d0a708786adbb357013955f99c0af)
|
|
|
|
|
| |
Reviewed-by: Gunnar Sletta
(cherry picked from commit 55b1f191d2ab97b2c1029f12e2315412e74a1dc2)
|
|
|
|
|
|
| |
Task-number: QTBUG-5869
Reviewed-by: Sarah Smith
(cherry picked from commit 73477789bdeeba851cf095cbdda5c36d9f5c31df)
|
|
|
|
| |
(cherry picked from commit 9590574158d0d976f66c9f7ca36f88b2f28d52b9)
|
|
|
|
|
|
|
|
| |
Otherwise, we get errors from one test to the next, due to the cleanup
unregistering the name again.
Task-number: QT-5588
(cherry picked from commit 65e00180516eb136c2a7119dfe9e63fc9c66065e)
|
|
|
|
| |
(cherry picked from commit b1196d5733ae01660e4345a5bbecd9c1b32238a4)
|
|
|
|
|
| |
Task-number: QTBUG-5972
(cherry picked from commit f01c631f84f9373b06d0572bfed7a4e8213a46a7)
|
|
|
|
|
|
|
| |
This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188.
Task-number: QTBUG-5972
(cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)
|
|
|
|
| |
Reviewed-by: Shane Kearns
|
|
|
|
| |
Acked-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
| |
This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c.
Conflicts:
doc/src/qt4-intro.qdoc
|
|
|
|
|
|
|
|
|
| |
these aren't *strictly* bogus, but rather confusing. the real issue is
that the functions would get confused by something which looks like a
BOM, but isn't, and there is nothing one could do about it.
Reviewed-by: Volker Hilsheimer
(cherry picked from commit bb4e301ce6762ab300618c579bd65ea1ee17dc2d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page
By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians
Reviewed-By: Janne Anttila
(cherry picked from commit ea0f526ac3a7daef5d4ebff2373a01d4088e28c3)
|
|
|
|
|
|
|
| |
Someone had changed an operator==() and an operator!=() from
single parameter members to two-parameter friends but hadn't
changed the qdoc comments.
(cherry picked from commit d65bff4c94fb11bbad02420459a9375621051823)
|
|
|
|
| |
(cherry picked from commit 87e7b96ccf3385dcfff079a69a4c6e45f8b5bc52)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit d46b4208147ec01aba19c703f21954f068b4dc06)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was introduced by d0b0b525de.
The use of QT_NO_DEBUG macros causes release-armv5 builds to fail
when the -release option is passed to configure.
This change causes the debugging code (ObjectDump and related
classes) to be included in release builds, although these functions
are not executed.
This is a temporary fix; task QTBUG-6012 has been created for
re-removing this code from release builds.
Reviewed-by: Frans Englich
(cherry picked from commit f3118df6af745759a73d8a9f40d1fa1a90a4385a)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit 041f7fc92959d4aefa88fca7a6f5d153faf4aa0a)
|
|
|
|
|
| |
Reviewed-by: Thiago Macieira
(cherry picked from commit 9e75354eabbc3c58472ed0c3dc9cba831827c38a)
|
|
|
|
|
|
| |
Reviewed-By: Trust Me
(cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
(cherry picked from commit 2a444790abd05de2dd5aa546ad1745f911f2a73c)
|
|
|
|
| |
(cherry picked from commit d5a92bdd3f0f355a05b8f6ceac577f0c12c3bd5d)
|
|
|
|
|
|
|
|
| |
The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.
Reviewed-by: Olivier Goffart
(cherry picked from commit 34044853d4315309920a481a585f96ba7b3fb140)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit ac1bffa549e7f16fce3b009a68899e0d25574a7c)
|
|
|
|
|
|
|
| |
See QTBUG-5532.
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 9f5dea393da4428685f1a1fd26b0e27f90dca340)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: TrustMe
Conflicts:
doc/src/platforms/symbian-support.qdoc
Something went wrong with the cherry-picks, spotted by Jason.
Conflicting cherry-pick of 9a4995711746103286ea3fb9cc576e133fd29e4e.
(cherry picked from commit 865409a01af971411c0b68a171d5b4c0242cf0a1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
( 7bdf90f753d25fb1b5628b0980827df11110ad5a )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.
* tests/qwebelement/tst_qwebelement.cpp:
(tst_QWebElement::render):
2009-11-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Tor Arne Vestbø.
Clarify and simplify the legal section in the overview documentation,
after review with our legal team.
* docs/qtwebkit.qdoc:
2009-11-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed and suggested by Tor Arne Vestbø.
Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f
to compare the Qt::ImFont property's family against an explicitly
previously configured family.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods):
(cherry picked from commit 1ca2903b81c77573d37c5bd486b8d8e49a87ffc1)
|
|
|
|
|
| |
Reviewed-by: Bradley T. Hughes
(cherry picked from commit bf01b2fada207ee171224386771445487054d42b)
|
|
|
|
|
| |
Task-number: QTBUG-5764
(cherry picked from commit 422ed1c94869e4a93a14602beef69f5b08941060)
|
|
|
|
|
| |
Task-number: QTBUG-5764
(cherry picked from commit 11f192c2bc15b468379032f329d8805aac4a0886)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moc got confused when Q3FileDialog was there
in the carbon build but not in the cocoa build.
(QT_MAC_USE_COCOA is defined by macros which moc
does not evaluate)
Fix this by porting Q3FileDialog to cocoa by using
the compat functions in QFileDialog.
revby:Prasanth Ullattil
(cherry picked from commit e59d974ddf2f2a413611ba4d8594c6413499a645)
|