summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David BoddieDavid Boddie2009-11-042-7/+91
| | | | | | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David Boddie Doc: Fixed and synchronized QWebView related documentation. Reviewed-by: Trust Me
* Re-apply change 422c747c5108f9f0c544b5dd0789df32aa498fb7 by Martin SmithMartin Smith2009-11-041-1/+1
| | | | | | Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin Smith Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin Smith doc: Changed Trolltech to Nokia
* Re-apply change 2fbc823bb66db6ef6f6acc74d2baa96ebe1dec81 by Jocelyn TurcotteJocelyn Turcotte2009-11-041-2/+6
| | | | | | | | | | | | | | | | Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn Turcotte Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn Turcotte Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
* Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QILiang QI2009-11-044-2/+10
| | | | | Fix tst_qwebpage and tst_qwebframe compilation on Symbian. RevBy: TrustMe
* Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( ↵Jocelyn Turcotte2009-11-0440-342/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16aab1b39e14195abdc2100265da2e45b96b739f ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-04 Yael Aharon <yael.aharon@nokia.com> Reviewed by Simon Hausmann. [Qt] REGRESSION: Allow applications to use their own QWidget bypassing QWebView. https://bugs.webkit.org/show_bug.cgi?id=30979 Decouple QWebViewPrivate from QWebPageClient, and automatically create QWebPageWidgetClient whenever the view is QWidget based. * Api/qwebpage.cpp: (QWebPageWidgetClient::QWebPageWidgetClient): (QWebPageWidgetClient::scroll): (QWebPageWidgetClient::update): (QWebPageWidgetClient::setInputMethodEnabled): (QWebPageWidgetClient::setInputMethodHint): (QWebPageWidgetClient::cursor): (QWebPageWidgetClient::updateCursor): (QWebPageWidgetClient::palette): (QWebPageWidgetClient::screenNumber): (QWebPageWidgetClient::ownerWidget): (QWebPageWidgetClient::pluginParent): (QWebPage::setView): * Api/qwebview.cpp: (QWebView::~QWebView): (QWebView::setPage): (QWebView::event): 2009-11-03 Andras Becsi <becsi.andras@stud.u-szeged.hu> Reviewed by Simon Hausmann. [Qt] Fix build of unit-test after r50454. * tests/qwebpage/tst_qwebpage.cpp: 2009-11-03 Simon Hausmann <hausmann@webkit.org> Reviewed by Tor Arne Vestbø. Make QWebPluginDatabase private API for now. https://bugs.webkit.org/show_bug.cgi?id=30775 * Api/headers.pri: * Api/qwebplugindatabase.cpp: * Api/qwebplugindatabase_p.h: Renamed from WebKit/qt/Api/qwebplugindatabase.h. * Api/qwebsettings.cpp: * Api/qwebsettings.h: * QtLauncher/main.cpp: (MainWindow::setupUI): * tests/tests.pro: 2009-11-03 Simon Hausmann <hausmann@webkit.org> Rubber-stamped by Tor Arne Vestbø. Oops, also remove the API docs of the removed networkRequestStarted() signal. * Api/qwebpage.cpp: 2009-11-03 Simon Hausmann <hausmann@webkit.org> Reviewed by Tor Arne Vestbø. Replace the QWebPage::networkRequestStarted() signal with the originatingObject property set to the QWebFrame that belongs to the request. https://bugs.webkit.org/show_bug.cgi?id=29975 * Api/qwebpage.h: * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction): (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction): (WebCore::FrameLoaderClientQt::startDownload): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::loadFinished): (TestNetworkManager::createRequest): (tst_QWebPage::originatingObjectInNetworkRequests): 2009-11-02 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Adam Barth. QWebView crash fix. The QWebView should not crash if the stop() method is called from a function triggered by the loadProgress signal. A null pointer protection was added in the ProgressTracker::incrementProgress. New autotest was created. https://bugs.webkit.org/show_bug.cgi?id=29425 * tests/qwebview/tst_qwebview.cpp: (WebViewCrashTest::WebViewCrashTest): (WebViewCrashTest::loading): (tst_QWebView::crashTests): 2009-10-30 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Tor Arne Vestbø. [Qt] Remove the QWebInspector::windowTitleChanged signal, QEvent::WindowTitleChange can be used to achieve the same. https://bugs.webkit.org/show_bug.cgi?id=30927 * Api/qwebinspector.cpp: * Api/qwebinspector.h: * WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::updateWindowTitle): 2009-10-29 Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Tor Arne Vestbø. [Qt] Implement DELETE HTTP method for XmlHttpRequest https://bugs.webkit.org/show_bug.cgi?id=30894 No new tests as this functionality is already tested by the xmlhttprequest LayoutTests. As this patch depends on an unreleased version of the dependent QtNetwork library and the tests will be enabled later once the dependent library is released (and the buildbot is updated). * Api/qwebframe.cpp: (QWebFrame::load):
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-04117-1220/+1883
|\
| * eval: add key for the installer to grep for.Daniel Molkentin2009-11-043-2/+2
| | | | | | | | Reviewed-By: con
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-04225-3869/+5024
| |\
| | * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0455-806/+1161
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | * Compile fix after the last gesture api changeDenis Dzyubenko2009-11-037-58/+50
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Cocoa: fix q3filedialog autotestRichard Moe Gustavsen2009-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3FileDialog does not exist in the cocoa port. Do ifdef this test out on cocoa Rev-by: prasanth
| | | * Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scale the pixmap to correct size (16,16) before setting as the image for the Document Icon button. Reviewed-by: Denis
| | | * Gesture api review.Denis Dzyubenko2009-11-0335-446/+441
| | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | * Modified gesture events propagation.Denis Dzyubenko2009-11-036-37/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| | | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-038-72/+90
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-039-102/+130
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Improved gesture scrollarea manualtest.Denis Dzyubenko2009-11-032-11/+33
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-033-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| | | * Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-033-5/+6
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * Cocoa: fix double emit bug from file dialogRichard Moe Gustavsen2009-11-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, Cocoa tells us twize whenever a selection change occurs in the native file dialog. This patch inserts a check that the selection actually changed before emitting any signals Rev-By: Prasanth
| | | * Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standardWindowButton:NSWindowDocumentIconButton will not return a valid NSButton unless you call setRepresentedURL or setRepresentedFilename for the NSWindow. This patch makes sure that setWindowIcon_sys() sets the icon using a valid NSButton. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-10-307-49/+182
| | | |\
| | | | * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-305-22/+109
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Denis
| | | | * Fix unit test and add autoCancel test for graphicsviewThomas Zander2009-10-301-26/+72
| | | | |
| | | | * Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | | * | Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-303-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataLocation now behaves as on the other platforms, QCoreApplication::organizationName() and applicationName() is included in the returned path.
| | | * | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| | | | |
| | | * | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-4988 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced a regression preventing the mac-spesific standardIcon code form being called. Call the Mac code if desktopSettingsAware is set. (QIcon::themeName() is only set on X11)
| | * | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Changelog 4.6.0: Designer/uic/uic3.Friedemann Kleint2009-11-041-0/+23
| | | |
| | * | Merge branch '4.6-s60' into 4.6axis2009-11-0441-186/+365
| | |\ \
| | | * | Made xmlpatterns autotests compile for SymbianMiikka Heikkinen2009-11-0315-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed xmlpatterns autotests so that they compile for Symbian with both RVCT and NokiaX86 compilers. Reviewed-by: Janne Koskinen
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-032-2/+4
| | | |\ \
| | | | * | Fixed an input method bug when erasing the last character.axis2009-11-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the editor contents if the new preedit string was empty. However, it could be empty because the user just erased it, so the bug was fixed by checking whether the preedit string in the event and in the editor are different. RevBy: Denis Dzyubenko
| | | * | | Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pro-file is missing '+' when it is adding QtOpenVg support for sis file. Task-number: None Reviewed-by: Janne Koskinen
| | | * | Fix qdatetime autotest regressionShane Kearns2009-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous addition to the test case to validate local time was too strict for all platforms. Reviewed-by: Paul
| | | * | Fix qclipboard autotest on s60 3.1Shane Kearns2009-11-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It launches 2 subprocesses that use QApplication. Added the resource files to deployment so that construction does not fail Reviewed-by: axis
| | | * | Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-032-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying the control environment also pops items from the original cleanup stack which is not owned by the control environment. This is a platform issue (and does not occur in 9.3 & 9.4). To avoid this causing a panic, the s60main is changed to not push items on the cleanup stack (instead, it TRAPs the call to main(), and deletes its allocations manually). A further 9.2 cleanup stack crash was caused when application construction fails (because of missing resource files). The resulting exception would bypass deleting the control environment, and return from main with the wrong cleanup stack active. This is resolved by doing the TRAP / cleanup / throw manually instead of using qt_trap_throwing (The control environment cannot be pushed to the cleanup stack, because it owns the cleanup stack at that time). This isn't a 9.2 specific bug, but rather is revealed by 9.2 because the missing resource file is non fatal in 9.3 and 9.4. Fixes many autotests which have crashed on S60 3.1 since the cleanup stack swapping patch. Reviewed-by: axis
| | | * | Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving function called without a TRAP Reviewed-by: Sami Merila
| | | * | Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was caused by S60 closing a handle under our feet when QApplication is destroyed. To avoid this, we open our own handle for the global lock instead of using the shared one inside CFbsBitmap. Also the global unlock/relock is not needed on S60 3.2 so this can be eliminated and save a few cycles (the function call was a no-op before) Reviewed-by: Jani Hautakangas
| | | * | Add the Symbian Foundation OS versionsShane Kearns2009-11-032-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian^1 - SV_SF_1 Symbian^2 - SV_SF_2 etc. This is for the benefit of developers working with the Symbian master codelines. Reviewed-by: axis
| | | * | QS60Style: impossible to open menu from styled QToolButtonSami Merilä2009-11-031-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores toolButton's menu indicator rect. This means that the button's menu cannot be triggered by the user, as the style does not draw the indicator at all. With this fix, style calculates a rect (including margins) for menu indicator and draws that (arrow down) into toolButton (by making the button bevel larger). Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| | | * | Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | Fix tst_qwebpage and tst_qwebframe compilation on Symbian.Liang QI2009-11-034-2/+10
| | | | | | | | | | | | | | | | | | | | RevBy: TrustMe
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-03333-31721/+11105
| | | |\ \
| | | * | | Force Qt libs to install on phone memory in Symbian.Miikka Heikkinen2009-11-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting Qt apps when Qt libs are installed on a memory card takes ages (15-20 seconds), because Symbian recalculates hash of the dll every time it loads it from a non-system drive. Worked around this issue by forcing installation of Qt libs to the C-drive. Task-number: QT-690 Reviewed-by: Janne Koskinen
| | | * | | Build break fix for S60Simulated styleSami Merilä2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60Simulated style broke down after change SHA da9880eaed0d09338717db1a73db01e6b0ab080d, because part()-method call in simulated style was not updated to have additional parameter. Task-number: None Reviewed-by: Shane Kearns
| | | * | | Re-added checking for existence of sqlite3 binaries to Symbian buildsMiikka Heikkinen2009-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always adding export for sqlite3 binaries will cause cleanup of platform provided versions on platforms that provide them. Fixed by adding check for existence of sqlite3.dso before adding the export statement to bld.inf. Task-number: QT-2419 Reviewed-by: Janne Koskinen
| | | * | | QS60Style - TabWidget text changes color when widget becomes dimmedSami Merilä2009-11-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style sets the tabWidget palette hash only for QPalette::Active. So, when widget becomes disabled, text color changes back to default. Task-number: QTBUG-4625 Reviewed-by: Alessandro Portale