summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
Commit message (Collapse)AuthorAgeFilesLines
* 2010-04-14 Kent Hansen <kent.hansen@nokia.com>Kent Hansen2010-05-042-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Maciej Stachowiak. Mac OS X: Use deployment target to determine whether memory tagging should be enabled https://bugs.webkit.org/show_bug.cgi?id=34888 When building on (Snow) Leopard but targeting Tiger (TARGETING_TIGER defined, BUILDING_ON_TIGER not defined), WebKit would crash on Tiger because the tags passed to mmap caused those function calls to fail. Conversely, when building on Tiger but targeting Leopard (BUILDING_ON_TIGER defined, TARGETING_LEOPARD defined), WebKit would crash on Leopard because the tags passed to vm_map and vm_allocate caused those function calls to fail. Solution: Use TARGETING_TIGER rather than BUILDING_ON_TIGER to govern the tag definitions. Use the same tags for vm_map and vm_allocate regardless of target, since they work on both. Fall back to the mmap tags that work on Tiger (that is, "no tags") if targeting Tiger, since those tags also work on Leopard. * wtf/VMTags.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@57583 268f45cc-cd09-0410-ab3c-d52691b4dbfc
* DEF file fixJanne Koskinen2010-04-241-25/+24
| | | | | | | Open C unnecessarily exports inlined getloc. entry removed. Reviewed-by: Shane Kearns (cherry picked from commit 02c65146610cdd5bfe1f3ee4656ba07af82afcc7)
* QtWebkit WINS DEF file freezeJanne Koskinen2010-04-231-1/+27
| | | | | | | Freeze against previous release 4.6.2 to maintain BC. Reviewed-by: Miikka Heikkinen (cherry picked from commit 9cc9da431fd99869a83b91f5be4911e0ead2f15f)
* QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-223-4/+4
| | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe (cherry picked from commit 594f81c553d52901209c079e2887fb13990ecba4)
* Remove overloaded placement new operatorsJanne Koskinen2010-04-212-2/+0
| | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann (cherry picked from commit cc26a3ec5c6bfde206c7354f87bebd36b70e1205)
* WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-211-2/+4
| | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann (cherry picked from commit 0d1739197015a651b88d710c9c961eb0f20278f9)
* WINSCW boolean fix for XPATHJanne Koskinen2010-04-212-2/+16
| | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann (cherry picked from commit 07aa94196e5ab6827099c683c0be96edbc62e6c0)
* WINSCW compile fix for HashMapJanne Koskinen2010-04-211-4/+4
| | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen (cherry picked from commit c16ca6d08d7e3e7a0972aa1975a72882559edb26)
* WINSCW compile fix for WebCoreJanne Koskinen2010-04-211-2/+3
| | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen (cherry picked from commit e0314fa999e58a057604cdbd4bd6fdfe5248d75e)
* WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 690e0f27ae23189200d98e9300b63914d8e1fe30)
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-161-2/+2
| | | | (cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
* Fix compilation: StringImpl has no public, default constructorThiago Macieira2010-04-152-0/+3
| | | | | | | | Error was: platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor Reviewed-by: Janne Koskinen (cherry picked from commit 42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e)
* QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| | | | | | | | Since it is now a static library, this configuration has to be added explicitely. This patch should be overwritten by the next WebKit import. Reviewed-by: Simon Hausmann
* QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| | | | | | This patch should be overwritten by the next WebKit import. Reviewed-by: Kent Hansen
* Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1
| | | | | | | | | It's been failing in WebKit trunk for a long time (forever?), and the fix is not entirely trivial. The expected failure message has the link to the upstream issue, which has more detailed comments. Reviewed-by: Jocelyn Turcotte
* QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*Jocelyn Turcotte2010-04-1312-10/+20
| | | | Reviewed-by: TrustMe
* QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
* Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-121-2/+2
| | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
* QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
* QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-122-9/+3
| | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
* QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
| | | | Rubber-stamped-by: Simon Hausmann
* QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
| | | | Reviewed-by: Simon Hausmann
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
| | | | | | | | Imported from 862268aeb7150d3795d05bfc05f661bb5c598a27 in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Reviewed-by: TrustMe
* Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
| | | | | | Cherry-pick of http://trac.webkit.org/changeset/57320 Don't mix NDEBUG and DEBUG between JSC and WebCore.
* Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
| | | | | | | | | | | | | The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
* QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
* QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
* QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
| | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
* QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13
| | | | Rubber-stamped-by: Simon Hausmann
* QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-062-8/+4
| | | | Reviewed-by: Simon Hausmann
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-063624-151389/+317257
| | | | | | | | Imported from 839d8709327f925aacb3b6362c06152594def97e in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Rubber-stamped-by: Simon Hausmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-301-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-301-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash QtScript: Add yet more missing API shims QtScript: Make sure the old identifier table is restored ...
| | | * Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-271-2/+2
| | | | | | | | | | | | | | | | Reviewed-By: Thiago Macieira
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-251-0/+3
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2514-11/+205
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
* | | \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-317-39/+305
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-307-39/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 ) Changes in WebKit/qt since the last update: * r56370 - https://bugs.webkit.org/show_bug.cgi?id=34350 -- [Symbian] More efficient aligned memory allocation for JSC Collector
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3029-150/+526
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-295-14/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( e9151b11e974f0aa47fd40c225f88f35ced91496 ) Changes in WebKit/qt since the last update: * r56546 - https://bugs.webkit.org/show_bug.cgi?id=35112 -- [Qt] Windowed netscape plugins don't work with QGraphicsWebView on Symbian
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-293-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( c39615d8e78f083b23f34ac24cf7d3a7ce765122 ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=34262 -- Accept XHTML MP content type as XHTML content
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-2925-135/+468
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( bd724fb2f716336a8a4b54cd2edc96851a5a26a4 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-03-22 Jakub Wieczorek <jwieczorek@webkit.org> Reviewed by Simon Hausmann. [Qt] Don't construct a QLineEdit every time when painting a text field https://bugs.webkit.org/show_bug.cgi?id=36373 Add a simple benchmark covering this area. * tests/benchmarks/painting/tst_painting.cpp: (tst_Painting::textAreas): 2010-03-22 Yi Shen <shenyi2006@gmail.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=35933 [Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard Make sure the selection start index is smaller than the selection end index. * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): 2010-03-25 Yael Aharon <yael.aharon@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] QtLauncher crashes on Mac OS and Linux when exiting with QGraphicsView mode enabled https://bugs.webkit.org/show_bug.cgi?id=35251 Followed the way QWebView registers for the signal QWebPage::destroyed(), to prevent QGraphicsWebView from referencing QWebPage after it was deleted. * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::_q_pageDestroyed): (QGraphicsWebView::setPage): * Api/qgraphicswebview.h: 2010-03-23 David Leong <david.leong@nokia.com> Reviewed by Laszlo Gombos. Build fix for Symbian Def file. * symbian/eabi/QtWebKitu.def: 2010-03-18 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Simon Hausmann. [Qt] New API scrollRecursively has several problems. https://bugs.webkit.org/show_bug.cgi?id=35873 Remove scrollRecursively from the Qt 4.7 API Update the internal API to accept a hit test position for nested scrolling * Api/qwebframe.cpp: (webframe_scrollOverflow): (qtwebkit_webframe_scrollRecursively): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/tst_qwebframe.cpp: 2009-12-18 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow then checking current frame and then ancestors https://bugs.webkit.org/show_bug.cgi?id=32668 * Api/qwebframe.cpp: (QWebFramePrivate::scrollOverflow): (QWebFrame::scrollRecursively): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/qwebframe.qrc: * tests/qwebframe/testiframe.html: Added. * tests/qwebframe/testiframe2.html: Added. * tests/qwebframe/tst_qwebframe.cpp:
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2914-11/+205
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-246-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-03-21 axis Reviewed by Simon Hausmann. Fixed updating the VKB display when inputting into QGraphicsWebView. https://bugs.webkit.org/show_bug.cgi?id=36292 * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::_q_updateMicroFocus): (QGraphicsWebView::setPage): * Api/qgraphicswebview.h: WebCore: [Qt] Support for QT_LIBINFIX in Symbian builds Patch by Miikka Heikkinen <miikka.heikkinen@digia.com> on 2010-03-19 Reviewed by Simon Hausmann. Configuring Qt with -qtlibinfix parameter will enable installing an alternate version of Qt on devices that already have it on ROM. This patch provides support for infixed builds of Webkit.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-2211-7/+174
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Stop QHostInfo thread pool when application is about to exit Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d95c54951e7af2aa7def4346a142b2162bd89bbd )
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-2211-7/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( d95c54951e7af2aa7def4346a142b2162bd89bbd ) Changes in WebKit/qt since the last update: https://bugs.webkit.org/show_bug.cgi?id=33408 -- Add flag IGNORE_FIXED_BACKGROUNDS (disabled by default) to ignore fixed background images and accelerate web page scrolling on low-powered/mobile devices https://bugs.webkit.org/show_bug.cgi?id=34168 -- [Qt] Enable FAST_MOBILE_SCROLLING on Qt embedded platforms https://bugs.webkit.org/show_bug.cgi?id=33150 -- Do not render the full frame when there is some elements with fixed positioning
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-231-0/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-221-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-211-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors Dont force height for filter widget - Fix importdir option on unix/linux configure Remove incorrect semi-colons after Q_PROPERTY ...