| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
| |
These two classes were missing exports. Since the accessors are inline,
the bug would only be visible when someone tried to call the
constructors of the classes.
Reviewed-by: Kent Hansen
(cherry picked from commit c7135e9b8d76e50daaa38d5d163687357878dc24)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
before, when configured with -openssl-linked, configure.exe hang,
because of the following:
We were checking for XQMAKESPEC via something like
'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC
value to the dictionary. Later (line 3030), we checked whether
XQMAKESPEC was set (which was now true), and we used the value although
it was empty.
Reviewed-by: Thiago Macieira
Reviewed-by: Denis Dzyubenko
(cherry picked from commit 009f01107fd062c1cd478fc9dbf20d927ff9c459)
Conflicts:
configure.exe
|
|
|
|
|
|
|
|
|
|
|
| |
It wasn't generating any message, but it did think it was an
evaluation install. So all Qt console applications produced an extra
newline and the GUI ones showed the Qt logo briefly.
I noticed because of the extra newline when building Qt itself.
Reviewed-by: Trust Me
(cherry picked from commit 732e0d01df867200546ddb5e6f8695f263e1ee0d)
|
|
|
|
|
|
| |
QtScript now uses JavaScriptCore, where dates and regular
expressions are implemented in an ECMA compliant way.
(cherry picked from commit 5f1c10a15374e84e96e9e69e47f511acd3a71c4f)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make the information easier to find. There are many places that
refer to the QtScript module page for more information, but after
the documentation was recently restructured, all that information
now resides on the "Making Applications Scriptable" page.
This issue was also reported on the qt4-preview-feedback mailing
list.
Reviewed-by: David Boddie
(cherry picked from commit 22ba574eef8c9412b63efb1126e2f432367c7061)
|
|
|
|
|
|
|
|
|
|
| |
This is required due to the switch to the JavaScriptCore-based
back-end.
Instead of segfaulting somewhere inside JSC::initializeThreading(),
call qFatal() when this constraint has been violated.
Reviewed-by: Simon Hausmann
(cherry picked from commit fb4e81bdc692efe0db9aa38dd2b941578c0f0370)
|
|
|
|
|
|
|
|
|
| |
The file was erroneously imported from WebKit trunk.
It is not used when building QtScript, and the only practical
effect it has is to cause configure to spit out a warning.
Reviewed-by: Simon Hausmann
(cherry picked from commit 83c61c4dfb2425d92eced3b41d61b153a286a242)
|
|
|
|
|
|
|
|
|
|
| |
Some style relies on this broken behaviour that was fixed in commit
e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1
The text on the combobox uses the wrong palette role.
Reviewed-by: jbache
(cherry picked from commit a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
there were several changes made to configure.exe recently, this commit
makes sure we have rebuilt the binary after all the changes have been
made.
Reviewed-by: Thiago Macieira
(cherry picked from commit 16b41fec1b2bdd5cc5c849148464739925cbdfe6)
Conflicts:
configure.exe
|
|
|
|
|
|
|
| |
Needs recompile.
Reviewed-By: Thiago Macieira
(cherry picked from commit de8b7a4e69b0c5bb5504fd0930cde290984b0cc7)
|
|
|
|
|
|
|
|
|
| |
Add support for Symbian commercial licenses and adapt to the
possibility from the RT operating systems
Task-number: QT-2518
Reviewed-by: axis
(cherry picked from commit d1779085462e7050a32e2f785767b4ce0d0cbfe0)
|
|
|
|
|
|
|
|
| |
When building for one of the RTOS, require a specific license key.
Task-number: QT-2519
Reviewed-by: Jason McDonald
(cherry picked from commit 62e1db5793f9395e39091757135f4d96e564e6c2)
|
|
|
|
|
|
|
|
|
|
| |
Add the necessary logic to deal with Symbian and the Real-Time
operating systems (QNX and VxWorks). Symbian is considered an embedded
license, so it allows a no-deploy build on X11 and Mac.
Task-number: QT-2519
Reviewed-by: Jason McDonald
(cherry picked from commit 21bb070cb979f3b581d829d153794ef97427155f)
|
|
|
|
|
| |
Reviewed-by: Espen Riskedal
(cherry picked from commit fb5361e27e2c48d52c2fe26fc48f8ef1438755f5)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 97143d9c719951b85964a31c5e19bfeaddce9bae)
|
|
|
|
|
|
|
|
| |
The content was compiled primarily by asking the members of the S60
team.
Reviewed-by: David Boddie
(cherry picked from commit 53112dfd0b20abcf0448fbc25728f8b8534ba81b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made
QGraphicsShaderEffect private API, however the example showing how to
use it was kept. This patch just removes that example.
Reviewed-by: Samuel
(cherry picked from commit 1b14c3d33dea0fe4814f2749c49cf916ca13e012)
Conflicts:
examples/effects/customshader/blureffect.cpp
examples/effects/customshader/blureffect.h
examples/effects/customshader/blurpicker.cpp
examples/effects/customshader/blurpicker.h
examples/effects/customshader/customshadereffect.cpp
examples/effects/customshader/customshadereffect.h
examples/effects/customshader/main.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the webpage does define BODY colors for background, it is possible
that lineEdits are not drawn at all. Actually, they are drawn but with
transparent background, which makes them near-invisible. This is due
to that QS60Style tries to check if the themePalette has been changed
and if it has forwards the drawing of that particular widget to common
style. Common style unfortunately uses active style's palette to draw
the widget. S60Style defines Base to be transparent (to get the
theme background shine through) and common style tries to use Base
to draw lineEdit. End result is transparent lineEdit on webpage.
This fix makes more educated deduction when it tries to see if style
has been changed. This is related to QTBUG-4885.
Task-number: QTBUG-4885
Reviewed-by: Janne Koskinen
(cherry picked from commit 75ebdd04f41dd75be1e046a1c54ced0bfb78a0f2)
|
|
|
|
|
|
| |
Task-number: QTBUG-5528
Reviewed-by: Gabriel
(cherry picked from commit f7a030d62ef9fc7725716951b87ec52f6a0d4c2e)
|
|
|
|
|
|
|
|
|
|
|
| |
The execution flow would allow the widget the scene would be rendered on to be
null. However this very widget was being used when using DeviceCoordinateCache
to get the desktop size. We now skip this optimisation when no widget is
given. Auto-test included.
Reviewed-by: bnilsen
Task-number: QTBUG-5904
(cherry picked from commit b6070e9a069219e4049fcf017d6a160b80bf37b7)
|
|
|
|
|
|
|
|
|
|
| |
The problem was that the scene was not notified it lost the focus
when it was disconnected from the view (with setScene)
So when it got back the focus, nothing was updated because the
scene thought it still had the focus.
Reviewed-by: jasplin
(cherry picked from commit c535df0f286826c5575ec00c7e4c3f811a73918b)
|