summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-291-23/+0
|\
| * Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixedJocelyn Turcotte2009-10-281-23/+0
| | | | | | | | | | | | upstream. Reviewed-by: TrustMe
* | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850Shane Kearns2009-10-281-0/+15
|/ | | | | | | | | This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
* Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-261-13/+0
| | | | | | | | | | This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e. DEF file was unconditionally enabled for Webkit, ignoring setting in qtbase.pri, which was supposed to be the global place to enable/disable DEF file usage. Remove this workaround since we still haven't got DEF files switched on by default. (cherry picked from commit 3b7f570e6f296ef0a5c9c581ed06cb19986164a0)
* Doc: Added internal or hidden placeholder documentation.David Boddie2009-10-261-0/+17
| | | | | Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
* Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-10-261-0/+37
| | | | | | | | | | | | | | | | | These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
* Fix linking of WebKit on Linux 32-bit.Thiago Macieira2009-10-261-1/+2
| | | | | | It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
* Correct line ending chars imported from webkit.Jocelyn Turcotte2009-10-232-107/+107
| | | | Reviewed-by: TrustMe
* Doc: Fixed and synchronized QWebView related documentation.David Boddie2009-10-232-7/+91
| | | | Reviewed-by: Trust Me
* fix line endingOswald Buddenhagen2009-10-231-1/+1
|
* Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30671 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
* Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30670 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
* Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| | | | doc: Changed Trolltech to Nokia
* Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| | | | | | | | Temporary workaround to get WebKit to pick up DEF file from std location Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
* Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| | | | | | | | | | | | | | 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
* Updated WebKit from /home/jturcott/dev/webkit/ to ↵Jocelyn Turcotte2009-10-221270-11675/+33732
| | | | | | | qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 ) Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
* Qt patches to libpng sources.aavit2009-10-221-2/+12
| | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40.
* Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| | | | | This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
* VXWorks changes.Bill King2009-10-211-5/+24
| | | | Forward port the vxworks changes from d7b688870aead912690188b324d370b920a7a600
* Fixes: WebKit Windows CE buildBill King2009-10-211-1/+1
| | | | | | | | Details: Details: Make localtime a static function. This is needed for linking sqlite3.lib into webkit and it generally makes sense for our build of sqlite using the amalgamated build. (cherry picked from commit 5e326c74239eecbd3e64df90ebbafaf51530d43d)
* Trolltech modifications to SQLite.Bill King2009-10-211-2/+17
| | | | | | | | | | | | | | | | | | * Include <qconfig.h> and rely on Qt's QT_NO_THREAD instdead of SQLite's THREADSAFE to toggle source code releated to threading in SQLite. * compilation for Windows CE 6 While for WinCE 5 localtime is declared but not defined in the libraries, for CE 6 they are not even declared. That usually makes sense but sqlite relies on it being present in time.h. As sqlite defines their own localtime for Windows CE, we "only" need to forward declare it earlier. Conflicts: src/3rdparty/sqlite/sqlite3.c
* Update sqlite to 3.6.19Bill King2009-10-212-30056/+53754
|
* Fix bug introduced by cleanup commit.Frans Englich2009-10-201-2/+0
| | | | Reviewed-by: Gareth Stockwell
* Merge branch 'mmfphonon' into 4.6Frans Englich2009-10-202-3/+5
|\
| * Does not disable full screen when end of video playlist is reached.Frans Englich2009-10-191-1/+1
| | | | | | | | | | | | | | Tested on Symbian and Windows(DS9). Task-number: QTBUG-4869 Reviewed-by: Gareth Stockwell
| * Kill warning, simplify code.Frans Englich2009-10-161-2/+4
| | | | | | | | Reviewed-by: TrustMe
* | doc: Changed Trolltech to NokiaMartin Smith2009-10-161-1/+1
|/
* Replace tabs with whitespace.Frans Englich2009-10-155-65/+65
| | | | | sed -i -e 's/\t/ /g' `find -name "*.cpp" -or -name "*.h" -or -name "*.pro"`
* sed -i -e 's/for(/for (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-154-5/+5
| | | | "*.pro"`
* sed -i -e 's/if(/if (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-157-45/+45
| | | | "*.pro"`
* Use QT_NO_DEBUG, not _DEBUG.Frans Englich2009-10-154-9/+9
|
* Remove trailing whitespace.Frans Englich2009-10-157-108/+108
|
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1511-12/+168
|\ | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h
| * Temporary workaround to get WebKit to pick up DEF file from std locationIain2009-10-131-0/+13
| | | | | | | | | | | | | | Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| * Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39Jocelyn Turcotte2009-10-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 2009-10-09 Joe Ligman <joseph.ligman@nokia.com>Joe Ligman2009-10-117-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Hausmann. Sets Qt::WA_InputMethodEnabled and Qt::ImhHiddenText for password fields in EditorClientQt setInputMethodState. This change is needed so widgets such as the s60 software input panel can receive input method events for password fields. It's up to the Qt platform to determine which widget will receive input method events when these flags are set. Also added implementation for setInputMethodEnabled and setInputMethodHint to QGraphicsWebViewPrivate and QWebViewPrivate. This change removes the direct dependency on QWebView and uses QWebPageClient. Added autotest to tst_qwebpage.cpp https://bugs.webkit.org/show_bug.cgi?id=30023 * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::setInputMethodEnabled): (QGraphicsWebViewPrivate::setInputMethodHint): * Api/qwebview.cpp: (QWebViewPrivate::setInputMethodEnabled): (QWebViewPrivate::setInputMethodHint): * WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::setInputMethodState): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): 2009-10-09 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Simon Hausmann. [Qt] Added pure virtual methods setInputMethodEnabled and setInputMethodHint to QWebPageClient https://bugs.webkit.org/show_bug.cgi?id=30023 * platform/qt/QWebPageClient.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49397 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Fix compilation with aCC 6: this compiler has broken for scopingThiago Macieira2009-10-091-0/+5
| | | | | | | | | | | | "../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 860: error #2101: "size" has already been declared in the current scope "../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1560: error #2101: "span" has already been declared in the current scope "../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1807: error #2101: "s" has already been declared in the current scope
| * Fix compilation with aCC 6: cannot redefine a variable in the same scopeThiago Macieira2009-10-091-1/+1
| | | | | | | | | | | | "../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 2927: error #2101: "h" has already been declared in the current scope for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h = h->next_) { ^
| * Conservative fix for link error with ARM RVCT compiler on symbian sbsv2Shane Kearns2009-10-081-4/+19
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. However windows builds don't support export of templated class, and export the vtable implicitly when there is an exported member function. Task-number: QTBUG-4593 Reviewed-by: Thierry Bastian
| * Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"Shane Kearns2009-10-071-4/+12
| | | | | | | | | | This reverts commit 342fcb287b09d016d482e25482ddd1b36e2983a3. Didn't work on all compilers
* | Modified video widget to respond to WinIdChange eventsGareth Stockwell2009-10-092-0/+12
| | | | | | | | | | Task-number: QTBUG-4664 Reviewed-by: Frans Englich
* | Reformatting to comply with Qt code styleGareth Stockwell2009-10-092-9/+9
| | | | | | | | Reviewed-by: Frans Englich
* | Refactored event-handling code in video widgetGareth Stockwell2009-10-092-13/+15
| | | | | | | | | | | | Moved common code into videoOutputRegionChanged() Reviewed-by: Frans Englich
* | Modified ObjectDump annotator for Symbian window informationGareth Stockwell2009-10-091-35/+35
| | | | | | | | | | | | This prevents a crash when applied to controls which are non-window owning Reviewed-by: Frans Englich
* | Added ObjectDump annotator which prints Symbian-specific internal widget flagsGareth Stockwell2009-10-092-0/+40
| | | | | | | | Reviewed-by: Frans Englich
* | Modified getDsaRegion to be compiled only in debug buildsGareth Stockwell2009-10-091-4/+9
| | | | | | | | Reviewed-by: Frans Englich
* | Preventing unnecessary calls to CVideoPlayerUtility::SetDisplayWindowLGareth Stockwell2009-10-092-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getNativeWindowSystemHandles now checks the window handle and screen rectangle against the previous value; SetDisplayWindowL is only called if the window and/or screen rectangle have changed. This allows videoOutputRegionChanged to be called 'speculatively' - i.e. in response to Qt events which may or may not reflect a change in the underlying window system - with only actual window system events getting propagated into the MMF. The reason for this change is that SetDisplayWindowL results in the current DSA session (owned by CVideoPlayerUtility) being torn down and a new one set up. This in turn requires handshaking with the window server, and may be slow. Reviewed-by: Frans Englich
* | Simplified handling of native window information in VideoPlayerGareth Stockwell2009-10-092-64/+55
|/ | | | | | | | | | | Now retrieve RWsSession and CScreenDevice from CCoeEnv::Static() once (at construction), instead of at every call to getNativeWindowSystemHandles(). Collapsed m_screenRect and m_clipRect into a single m_rect member, since the two rectangles are always identical anyway. Reviewed-by: Frans Englich
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-075-13/+33
|\
| * Fix linker error with Symbian/ARM RVCT ABIv2 toolchainShane Kearns2009-10-071-12/+4
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. Changing from member exports to exporting the class also fixes the GCC 3.4.x compiler error. Task-number: QTBUG-4593 Reviewed-by: Thiago
generated by cgit v0.12 at 2024-12-29 10:08:33 (GMT)