summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-056-8/+39
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-053-1/+15
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QMessageBox theme background is incorrect
| | * QS60Style: QMessageBox theme background is incorrectSami Merila2011-07-053-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use correct native theme graphic for dialog backgrounds. In the past, native menu background graphic was used for dialogs and menus. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-043-7/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adding "hkscs_2004" to the codec alias table Adding Kazakh entry to the codec alias table On symbian QMessageBox icon is on different side than in native dialog
| | * Adding "hkscs_2004" to the codec alias tableAlessandro Portale2011-07-041-0/+1
| | | | | | | | | | | | | | | Task-Number: QTBUG-19024 Reviewed-by: Olivier Goffart
| | * Adding Kazakh entry to the codec alias tableAlessandro Portale2011-07-041-1/+2
| | | | | | | | | | | | | | | | | | | | | A Symbian update after "Anna" may come with Kazakh support. Task-number: QTBUG-19024 Reviewed-by: Olivier Goffart
| | * On symbian QMessageBox icon is on different side than in native dialogSami Merila2011-07-042-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian dialogs have layout (on LeftToRight UIs) where icon is on the right and text on left. Whereas, Qt by default has icon on the left and text on the right. Fix Qt dialogs to behave like native ones on Symbian. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
* | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-0414-509/+1077
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix horizontal center alignment with trailing space
| | * | Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text drawn with horizontal center alignment (AlignHCenter) and QTextOption::IncludeTrailingSpaces flag as off should consider the trailing space width (leading space width for RTL lines), because textAdvance here ignores the space. Disregard that space width here in alignLine will make RTL lines aligned a bit to the right. In short, for something like this: |w1|space|text|w2| |<- totalWidth ->| we want to have w1 + spaceWidth = w2 = (totalWidth - textWidth)/2, so that the actual rendered text will appear at the center of the bounding rect. Task-number: QTBUG-18303 Reviewed-by: Eskil
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-041-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Regression: QS60Style - All standardIcons are drawn as "small icons"
| | * Regression: QS60Style - All standardIcons are drawn as "small icons"Sami Merila2011-07-041-1/+1
| |/ | | | | | | | | | | | | | | StandardIcon enum comparison should be done with bitwise operation, not with value. Task-number: QTBUG-20240 Reviewed-by: Tomi Vihria
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-0114-504/+1068
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: provide more standard icons Update QtOpenGL section in Symbian platform notes. The qmlshadersplugin deployment must be scoped same as its building Do not try to open VKB if it is already open in Symbian Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine
| | * QS60Style: provide more standard iconsSami Merila2011-07-014-6/+638
| | | | | | | | | | | | | | | | | | | | | | | | Add custom standard icons for Symbian iconography. Additionally, map few existing standard icon enums to new icons. Task-number: QT-5116 Reviewed-by: Miikka Heikkinen
| | * Update QtOpenGL section in Symbian platform notes.Jani Hautakangas2011-07-012-5/+42
| | | | | | | | | | | | | | | Task-number: QTBUG-20216 Reviewed-by: Laszlo Agocs
| | * The qmlshadersplugin deployment must be scoped same as its buildingMiikka Heikkinen2011-06-301-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The check "contains(QT_CONFIG, opengl)" is used to include shaders subdir, so the same check needs to be used when defining deployment for shaders in s60installs.pro Task-number: QTBUG-20192 Reviewed-by: TrustMe
| | * Do not try to open VKB if it is already open in SymbianMiikka Heikkinen2011-06-301-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QEvent::RequestSoftwareInputPanel was handled when there was already an active virtual keyboard that had a child dialog open such as symbol or writing language selection dialog, the VKB would be brought to foreground on top of the child dialog, causing several problems, such as options menu and letter keys no longer working in VKB. Fixed by checking if VKB is already open before opening it again. Task-number: QT-5133 Reviewed-by: Sami Merila
| | * Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engineJani Hautakangas2011-06-306-471/+339
| | | | | | | | | | | | | | | | | | | | | | | | Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*) on OpenGL graphics system. Task-number: QTBUG-15254 Reviewed-by: Laszlo Agocs
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-07-043-19/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fixing winscw def file broken by recent merge runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-271-10/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fixing winscw def file broken by recent merge
| | * | | Fixing winscw def file broken by recent mergemread2011-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui's def file had duplicated lines and a gap in the ordinal sequence. Reviewed-by: Shane Kearns
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-27112-455/+2275
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (40 commits) qsystemlibrary needs no special treatment my changelog for 4.8.0 Use numeric virtual keyboard for all number entry modes. QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Workaround webkit deadlock on macos x QAuthenticator::setUser() parse user name in form user@domain tst_qnetworkreply: add a test for http abort. Disable antialiasing for tiled image drawing. Ensure visibility of input widget in QML app when doing layout switch Def update for gui, openvg, and opengl. Revert "Def update." Fix trailing whitespace Remove unnecessary resizes during orientation change Revert "Symbian: Fix QFontInfo::pixelSize()" Improving warning messages in QVolatileImage. Proper naming for raster pixmap and paintengine on Symbian. Def update. ...
| | * | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-06-27112-455/+2275
| | |\ \ \
| * | \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-2416-71/+134
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X Add a function that returns the D-Bus local machine ID Add an SSE4.2 even simpler version of toLatin1 Skip boundry neutral characters in bidi itemization Update autotest case after toHtml change Proper fix for previous deallocation problem No need to destroy match pattern again Fix fontconfig usage in X11 font database Fix empty lines in Qt HTML when displayed in external browsers (again) Make it possible to set color of QStaticText with pixel size >= 64
| | * | | | runonphone: Change the upload option to allow uploading any fileMartin Storsjo2011-06-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows uploading of any file to any directory on the phone. Merge-request: 1271 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * | | | runonphone: Include the manufacturer name in the friendly name on OS XMartin Storsjo2011-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps automatic detection of devices such as N8-00, that don't include Nokia in the product name (while devices from earlier generations did include it, such as "Nokia 5800 XpressMusic"). Merge-request: 2633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * | | | runonphone: Fix usb device enumeration on Mac OS XMartin Storsjo2011-06-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in 763f3acd879648648465475aef773fe0876934a9, when merged in a315c693d0f3dd64711b8459d86b89ddc48e8c1a, broke the usb device enumeration on OS X. This commit makes it work again, but now we look for two /dev entries per device (although only one of them exists). If many usb devices are connected, this increases the risk for false matches - if that ever happens, the iteration/checking that was removed in 763f3acd879648648465475aef773fe0876934a9 could be readded within the #ifdef Q_OS_MAC, making it add only one regexp per device again. Merge-request: 2633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * | | | Merge remote branch 'qt/4.8'Shane Kearns2011-06-2414-62/+119
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-2389-1165/+2459
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (33 commits) symbian socket engine: resolve some fixme and todo items trivial: fix typo in comment Fix QDeclarativeInspector when starting with ,block changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake qmlplugindump: Add -v option. ...
| | * | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-06-2389-1165/+2459
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-222171-2888/+74051
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (96 commits) Doc: Fixed spelling errors that were blocking the CI system. QDeclarativeDebug: Fix cases where multiple packets arrive in one go Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass. Added missing license headers. Added missing license headers. Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory Create property cache in case of Component{} root Doc: Added missing license headers for documentation and examples. qdoc: Fixed code to match comments in QML files. Fixed API types. Doc: Speculative attempt to fix build breakage. ...
| | * | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-06-222171-2888/+74051
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.8.0-betaQt Continuous Integration System2011-07-0320-48/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing typo
| * | | | | | | | | Doc: Fixing typoSergio Ahumada2011-07-0220-48/+48
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-07-0213776-1039988/+2118711
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits) Make sure the declarative plugin of QtWebKit is build once. Make sure JavaScriptCore is build once. Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. ...
| * | | | | | | | | Make sure the declarative plugin of QtWebKit is build once.Alexis Menard2011-06-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old WebKit the main pro file was not triggering the build of the declarative plugin therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-301-7/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: Make sure JavaScriptCore is build once.
| | * | | | | | | | | Make sure JavaScriptCore is build once.Alexis Menard2011-06-301-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old WebKit the main pro file was not triggering the build of JavaScriptCore therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-2913776-1039981/+2118715
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits) Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. Hack SystemTimeWin.cpp to build on MSVC2005. Make Float32Array and Int16Array build on RVCT 2.x. ...
| | * | | | | | | | | Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45Alexis Menard2011-06-296-14/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| | * | | | | | | | | 2011-05-23 Matthew Delaney <mdelaney@apple.com>Alexis Menard2011-06-294-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 * wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger): 2011-05-23 Matthew Delaney <mdelaney@apple.com> Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path. * platform/graphics/FloatRect.cpp: (WebCore::enclosingIntRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87103 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
| | * | | | | | | | | Fix headers generation for QtWebKit.Alexis Menard2011-06-291-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncqt assumes that the pro files of modules are named the same way as the directory they are in. QtWebKit 2.2 has its main pro file called QtWebKit.pro and not qt.pro even if it's located in src/3rdParty/webkit/Source/WebKit/qt. This patch ensure that syncqt will look for a pro file if there is one in the directory in the case there isn't one named the same way as the directory. Reviewed-by:mariusSO
| | * | | | | | | | | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-283-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it. https://bugs.webkit.org/show_bug.cgi?id=63562 Some Qt auto-tests rely on <QtX/x.h> types of includes. * Api/qwebkitplatformplugin.h: * symbian/platformplugin/qwebkitplatformplugin.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
| | * | | | | | | | | Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.Alexis Menard2011-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library leaks symbols mostly due to gcc bugs. We can't really test WebKit. Reviewed-by: Thiago Macieira
| | * | | | | | | | | Fix the auto-tests of QtWebKit.Alexis Menard2011-06-285-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source tree of WebKit was reorganized. The pro files needs to be updated. Reviewed-by:Andreas Kling
| | * | | | | | | | | 2011-06-27 Joe Wild <joseph.wild@nokia.com>Alexis Menard2011-06-282-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Tests that a plugin of a swf file in a hidden iframe will not crash. This test required more than 1 content file and a timeout or else it would not repeat the error condition. This test will only crash on platforms (like Symbian) that don't allow nonvirtual functions to have a null this pointer. * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added. * plugins/hidden-iframe-with-swf-plugin.html: Added. * plugins/resources/iframe-content-with-swf-plugin.html: Added. 2011-06-27 Joe Wild <joseph.wild@nokia.com> Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Check for a null renderer to fix a crash. This situation can arise when external content/plugins is referenced from html elements with style="display:none". Test: plugins/hidden-iframe-with-swf-plugin.html * page/FrameView.cpp: (WebCore::FrameView::windowClipRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89876 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
| | * | | | | | | | | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-284-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports. https://bugs.webkit.org/show_bug.cgi?id=63533 We need to use the new QtQuick 1.x imports rather than the old deprecated version. * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml: * tests/qdeclarativewebview/resources/webviewtest.qml: * tests/qdeclarativewebview/resources/webviewtestdefault.qml: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
| | * | | | | | | | | Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9bAlexis Menard2011-06-2752-2120/+2901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beta1 of QtWebkit 2.2. Reviewed-by: Andreas Kling
| | * | | | | | | | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2390-1166/+2459
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90Alexis Menard2011-06-2221-76/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Andreas Kling