| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Changing "Trolltech" to "Nokia"
Task-number:QTBUG-7370
Reviewed-by:Trust me
(cherry picked from commit 5160af692fd0352457cdf12cb497e1b8d8eed858)
|
|
|
|
|
|
| |
Task-number: QTBUG-7908
Reviewed-by: TrustMe
(cherry picked from commit 07d81d0e0f15f015c7436992a99ef4b1ec36ae1c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them
Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.
This commit is still missing properly signed bootstrap.sis package.
Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
(cherry picked from commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976)
|
|
|
|
|
|
|
|
|
| |
This give the possibility to get the file name with the extension and
without the path.
Reviewed-by: Joao
Reviewed-by: Marius Storm-Olsen
(cherry picked from commit 4c8b2aa00acc00a95b6f950a4ab7de737631e494)
|
|
|
|
|
| |
`QT += network' is required to find the network headers.
(cherry picked from commit 0db6060e54d8d5862ae0b7ffa4d3c187d30fd159)
|
|
|
|
|
|
|
|
|
| |
Entering a page range which is valid, but outside of the printable
range would result in an infinite loop.
Task-number: QTBUG-6051
Reviewed-by: Simon Hausmann
(cherry picked from commit 7c2000060bbc152ae32594f3d4dd60bd3351dab0)
|
|
|
|
| |
(cherry picked from commit 0a9edf7a672b4a30b817439ad67a0e08e3670e8f)
|
|
|
|
|
|
|
| |
( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )
Changes in WebKit/qt since the last update:
(cherry picked from commit 5c8be23e6b5fa732f4c799c783a8b22a85992211)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit 4b059682ddba4a1fb90c656d7d829680779a2e60)
|
|
|
|
|
|
|
| |
Error strings are now part of the Phonon::MMF namespace.
Reviewed-by: trustme
(cherry picked from commit 14ee2007fd2ada46e5fe30af838f5a7fcb7c6f4d)
|
|
|
|
|
|
| |
Task-number: QT-2813
Reviewed-by: trustme
(cherry picked from commit a70a97cceccced13429b88f99373650d39da2f75)
|
|
|
|
|
| |
functions.
(cherry picked from commit 0c73b18d0750bee9da4b88de595aa6093b5be820)
|
|
|
|
|
|
|
| |
fixed during merge to match new style flag setting.
Reviewed-by: Janne Koskinen
(cherry picked from commit afae62256897a8ed14e3156df33838082c6d4b98)
|
|
|
|
|
| |
Reviewed-by: axis
(cherry picked from commit b5298dcf3d29b253a31974762cc9227b25f94e93)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added the "(QGraphicsSceneDragDropEvent)" behind the documentation of
the QGraphicsSceneDrag*-type events. Without this hint it gives the
impression that you can't access the data being dragged within
eventFilter()s.
Task-number: QTBUG-7547
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
(cherry picked from commit 48d040b3536dbce06f54c90da489a5308bee3870)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
(cherry picked from commit 2a8d20453926082062246fc4cc788f88ea3c59ae)
|
|
|
|
| |
(cherry picked from commit 7ced77b654eb46af1221a55e315795c1be1753a0)
|
|
|
|
|
|
|
|
|
|
| |
The tool bar appearance have regressed in 4.6 for applications that
do not utilize the unified tool bar appearance. This fix restores the
margin and spacing to their 4.5 appearance.
Task-number: QTBUG-7831
Reviewed-by: morten
(cherry picked from commit e4835d58381cd33fe067b05bfd6301d2246e3e67)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
DEPLOYMENT.manufacturers variable can be used to define manufacturer
identifiers.
DEPLOYMENT.manufacturers.fail_note variable can be used to define
a file that contains the text to be shown in case of failed
manufacturer check.
Task-number: QTBUG-7695
Reviewed-by: Janne Koskinen
(cherry picked from commit 08c1c9ef6f30706cd574eded656f4d65a1b18db5)
|
|
|
|
|
|
|
|
|
|
| |
QProcess::waitForFinished was panicking in Symbian when timeout of -1
was supplied. Fixed it to disable timeout and block until process
exit, as docs indicate it should.
Task-number: QTBUG-7667
Reviewed-by: Janne Anttila
(cherry picked from commit e63ea3587444e122242a137a699b5a717d3d26bd)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Text rendering in Qt for Symbian looks very bad on a scaled QPainter.
Instead of simply using a Symbian font with the right size it followed
the code path that is usually used for "tricky transformation":
Use the glyph outlines and rasterize them in Qt as QPainterPath.
That's slow and especially ugly on Symbian since we do not (yet)
get the glyph outlines from Symbian.
This patch adds QFontEngineS60::setFontScale() so that QFontEngineS60
has one additional native font handle with the scaled size. The raster
paint engine will call that function in case that the painter is scaled.
Since we already have QFontEngineS60 specific code in the raster paint
engine, this patch did not have to add #ifdefs.
http://bugreports.qt.nokia.com/browse/QTBUG-7614
Task-number: QTBUG-7614
Reviewed-by: Jason Barron
modified: gui/painting/qpaintengine_raster.cpp
modified: gui/text/qfontengine_s60.cpp
modified: gui/text/qfontengine_s60_p.h
(cherry picked from commit 5a64033f89e07505bb77d3c172597b8df3cbd762)
|
|
|
|
|
|
|
|
|
| |
( a733444d3be6605552471f047558927495ff62b7 )
Changes in WebKit/qt since the last update:
Fix up cherry-pick of backup restoration fix
(cherry picked from commit 54de7595a54e67efb60cdc9eb4c4ff15596c3763)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-28 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Simon Hausmann.
Do not set the combobox font on Maemo5 and S60; use the
default instead.
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopup::populate):
2010-01-28 Andreas Kling <andreas.kling@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Support kinetic scrolling on Maemo 5
https://bugs.webkit.org/show_bug.cgi?id=34267
Patch by Ralf Engels <ralf.engels@nokia.com> and
Robert Griebl <rgriebl@trolltech.com>
* Api/qwebview.cpp:
(QWebViewKineticScroller::QWebViewKineticScroller):
(QWebViewKineticScroller::eventFilter):
(QWebViewKineticScroller::currentFrame):
(QWebViewKineticScroller::scrollingFrameAt):
(QWebViewKineticScroller::attachToWidget):
(QWebViewKineticScroller::removeFromWidget):
(QWebViewKineticScroller::positionRange):
(QWebViewKineticScroller::position):
(QWebViewKineticScroller::viewportSize):
(QWebViewKineticScroller::setPosition):
(QWebView::QWebView):
2010-01-29 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Simon Hausmann
Disable auto-uppercase and predictive text on Maemo5, just like the
build-in MicroB Browser.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
(cherry picked from commit b8102ec6d2f01a0aedf2ecd5bbf16d3a5f6c296e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-28 Trond Kjernåsen <trond@trolltech.com>
Reviewed by Simon Hausmann.
[Qt] Fix for endless print loop when printing web pages
* Api/qwebframe.cpp:
(QWebFrame::print):
2010-01-26 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Show comboboxes on Maemo 5
https://bugs.webkit.org/show_bug.cgi?id=34088
Don't try to show the combobox by simulating a mouse event from QCursor::pos() to
get the combobox position right. The position on Maemo 5 is independent from the mouse
and there's no QCursor::pos().
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopup::show):
2010-01-26 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Simon Hausmann.
[Qt] JavaScript prompt is currently broken
https://bugs.webkit.org/show_bug.cgi?id=30914
In r52152 a patch was landed to convert a null QString
to an empty WebCore::String in case the prompt was accepted
but the default implementation returned the null QString.
The patch tried to avoid assign to result twice and
was not checking the QString if it is null but the default
value. This lead to always returning an empty string on
successful prompts. Fix it by checking the variable 'x'
for isNull.
The manual test case used didn't cover the case of non
empty input, replace it with an automatic test case that
should cover all cases.
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::runJavaScriptPrompt): Fix the bug.
* tests/qwebpage/tst_qwebpage.cpp: Add automatic test case
(JSPromptPage::JSPromptPage):
(JSPromptPage::javaScriptPrompt):
(tst_QWebPage::testJSPrompt):
(cherry picked from commit 4919286e4e9de496514f28432a81deb91d530fd1)
|
|
|
|
|
|
|
|
|
| |
( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )
Changes in WebKit/qt since the last update:
Fix from Girish
(cherry picked from commit df4d9f46e370a35c3178d95cae2a873e8a23ddb5)
|
|
|
|
|
|
|
|
|
| |
Sqlite3.sis was repackaged with backup_registration.xml to support
device backup/restore on Symbian
Task-number: QTBUG-7518
Reviewed-by: TrustMe
(cherry picked from commit 11bfc79b0f832f6544843ed13ef0efbcf51b22e9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-25 Janne Koskinen <janne.p.koskinen@digia.com>
Reviewed by Simon Hausmann.
[Qt] Phone backup support for QtWebkit for Symbian devices.
https://bugs.webkit.org/show_bug.cgi?id=34077
* symbian/backup_registration.xml: Added.
(cherry picked from commit efce7393cb8c6d7df52539dd7b7ac616cf46036c)
|
|
|
|
|
|
| |
Task-number: QTBUG-7518
Reviewed-by: Janne Koskinen
(cherry picked from commit ad1bc0ae6500092cbfb75ab869b3757add7ba4b7)
|
|
|
|
|
|
|
|
|
|
| |
Symbian OS limits applications to loading libraries only from /sys/bin
directory, so user defined library paths can only be useful for
locating Qt extension plugin stubs.
Task-number: QTBUG-7517
Reviewed-by: Janne Koskinen
(cherry picked from commit 00c4f1dbd8484ec887aea259021f5089334f45d7)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's annoying to lose preedit (e.g. underlined) text everytime a
focus switch occurs, especially because it can sometimes happen
while inside the FEP menus, such as "Insert symbol".
Fixed by committing the text in reset() implementation, rather than
discarding it.
Task: QTBUG-7439
RevBy: Sami Merila
(cherry picked from commit 01952109596f7563b43b12554fda0e4abc9a51ef)
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was done by intercepting key events with text in them, and
temporarily submit them as preedit text instead of real input text.
Currently it does not work in WebKit, but that is because WebKit
hides preedit text as well, which is a bug of its own.
RevBy: Simon Hausmann
Autotest: Manual testing went fine
(cherry picked from commit 87ee066fc86cf6410fd008a8a5d31122a7d5cc11)
|
|
|
|
| |
(cherry picked from commit 7b7f13d7ee1d5f93ee63a635c875accce918896a)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Changed the URL to be version independent.
Task-number: QTBUG-7295
Reviewed-by: TrustMe
(cherry picked from commit 9904192f956a75a3e007e1aec99ab7db433048ce)
|
|
|
|
|
|
|
|
|
|
| |
Catching by value causes GCC to use the compiler support function
__cxa_get_exception_ptr. This is not available in the compiler support
libraries on Symbian OS prior to Symbian^3. Catching by reference
avoids this problem.
Reviewed-by: mread
(cherry picked from commit ca3ce9263eaef963d934d221bd1dec37e7bf0871)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to
see if DEF files were enabled, when setting the DEF file path
Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was
defined when testing for its value, due to incorrect use of
QMap::operator[]
Tidy up configure.exe help for new def files option
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
Reviewed-by: Janne Koskinen
(cherry picked from commit f98901601fee4947fd0248f113b3a39a142292d5)
Conflicts:
configure.exe
|
|
|
|
|
| |
Task-number: QTBUG-7480
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QTBUG-7606
(cherry picked from commit 634eac05a6475280f2a1cc6e41e23c0c35628247)
|
|
|
|
|
|
|
| |
Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c
Contributed-by: Ritt Konstantin
(cherry picked from commit cefda8e4491ff82c96fceea2091f69160f8ae584)
|
|
|
|
|
|
|
|
|
|
| |
This avoids a number of reallocations due to appending.
This patch was contributed to us.
Task-number: QTBUG-3242
Reviewed-by: Thiago Macieira
(cherry picked from commit 7461ed5227e3002c4a6f74d458aa0255b7c1217d)
|
|
|
|
|
|
|
|
| |
audio-backend option was not being written out to qconfig.pri
Task-number:QTBUG-7782
Reviewed-by:Justin McPherson
(cherry picked from commit 65493e69454f8914d0ae1607e5a071ea07bb7017)
|
|
|
|
|
| |
Reviewed-by: Sarah Smith
(cherry picked from commit 416cf8a5a9384f942282a2c715ec4832eeba001d)
|
|
|
|
|
|
|
|
|
|
| |
The removed code simply reduces the size of the rect when running
with RightToLeft without compensating anywhere else. It seems to be
a leftover from a previously removed piece of code.
Reviewed-by: richard
Task-number: QTBUG-6882
(cherry picked from commit b4d60000981e298b7e40605a284f2b8b9b18fff5)
|
|
|
|
|
|
|
|
|
|
|
| |
Regression was introduced by commit
fd9cdaa55da455b90eacec571aeb2c84fa55f7e0.
Also fix a completely broken autotest that didn't actually test
anything.
Task-number: QTBUG-7688
Reviewed-by: Alexis
(cherry picked from commit 0585997b7dbe25ece9f60684171c16206d10d65f)
|
|
|
|
|
| |
Task-number: QTBUG-7640
(cherry picked from commit aebc34877fb17405e8e5915760012a82d0178b97)
|
|
|
|
|
| |
Task-number: QTBUG-7628
(cherry picked from commit a2c153f01c9b12eb6f1d46ffaf5533bb7b3695e2)
|
|
|
|
|
| |
Task-number: QTBUG-7626
(cherry picked from commit fc7b48c2d2fb5926fa0b50f378fadc583564b7b8)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
menu hiding.
The problem here was the way we entered Full Screen Mode. We were using
"kUIModeAllSuppressed" which does the following according to the manual:
kUIModeAllSuppressed
All system UI elements (including the menu bar) are hidden. However,
these elements may automatically show themselves in response to mouse
movements or other user activity.
I changed it to "kUIModeAllHidden", which does the following:
All system UI elements (including the menu bar) are hidden.
To prevent a change of behavior I added the following option to the
SetSystemUIMode:
kUIOptionAutoShowMenuBar
This flag specifies that the menu bar automatically shows itself when
the user moves the mouse into the screen area that would ordinarily be
occupied by the menu bar.
Only valid for the presentation mode kUIModeAllHidden.
Task-number: QTBUG-7625
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 9d207f042ea135eda6bcd91c47d581914470fa6d)
|
|
|
|
|
| |
Task-number: QTBUG-7605
(cherry picked from commit aa854adabedbe5ff95d02c0371ae90d85921061c)
|