summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Test console output works.Warwick Allison2009-09-181-0/+27
|
* Don't crash when no focusWarwick Allison2009-09-181-1/+2
| | | | | | Hard to reproduce, but all other similar code checks in this way. Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-171-5/+9
|\ | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| * Fixes: Fixed incorrect tracks number calculation with phonon/gstDmytro Poplavskiy2009-09-161-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Andrew den Exter Details: gst_element_query_duration(element,format,duration) doesn't always return duration in format being asked for (tracks in this case), it can also return duration in format it can (Time) and modify format parameter, so check the format is still the same as requested is necessary. This bug prevented Phonon to emit finished() signal with some files, since it expected next tracks to exist.
| * Doc: Note that Netscape plugins are only available on desktop platforms.David Boddie2009-09-091-3/+7
| | | | | | | | | | Reviewed-by: Takumi Asaki Also-applied-as: 3f257dcf8c8ca812d60d4a6a4c2cd2da96bba526
| * Update license headers again.Jason McDonald2009-09-081-4/+4
| | | | | | | | Reviewed-by: Trust Me
| * Fix #error line not to have a ' as it's not correctAlbert Astals Cid2009-08-311-1/+1
| | | | | | | | | | Merge-request: 753 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Separate the copy of JavaScriptCore that QtScript uses from the copy thatSimon Hausmann2009-09-16480-0/+238765
| | | | | | | | | | | | | | | | | | QtWebKit uses. This is needed to decouple QtScript from QtWebKit, as discussed in the WebKit team. Reviewed-by: Kent Hansen
* | Fixed a typo found during translationJure Repinc2009-09-141-1/+1
| |
* | Doc: Note that Netscape plugins are only available on desktop platforms.David Boddie2009-09-091-3/+6
| | | | | | | | | | Reviewed-by: Takumi Asaki Will-also-be-applied-to: 4.5
* | Fix crash of QtScript on Mac OS XSimon Hausmann2009-09-091-2/+6
| | | | | | | | | | | | | | | | | | 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
* | Fix crash in QtScript with exceptions.Simon Hausmann2009-09-091-1/+2
| | | | | | | | | | | | | | When trying to determine if there is a handler for an exception, determine the returnPC for the call frame traversal frmo the corrent CallFrame object. Reviewed-by: Kent Hansen
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-095-9/+12
|\ \
| * | Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | fix major memory leak in JavaScriptCore RegisterFile on Windows CEJoerg Bornemann2009-09-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | On Widows CE we must decommit all committed pages before we release them. See VirtualFree documentation. Desktop Windows behaves much smoother in this situation. Reviewed-by: ariya
| * | make JavaScriptCore compile on platforms with case-insensitive file systemKent Hansen2009-09-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | There's a clash between "TypeInfo.h" and a standard header "typeinfo.h" that's included from a place we don't control. The fix is to rename "TypeInfo.h" to "JSTypeInfo.h". Reviewed-by: Simon Hausmann
* | | Fixed compiler warnings for RVCT compiler.Janne Anttila2009-09-092-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling libmng for RVCT the following compiler warnings were reported: - #177-D: variable "pTemp" was declared but never referenced - #14-D: extra text after expected end of preprocessing directive This fix delays the pTemp declaration, until they are needed inside used for example in 'mng_create_imagedataobject' function. For 'extra text after expected end of preprocessing directive' warning the fix is to use: #endif /* MNG_SUPPORT_WRITE */ Instead of: #endif MNG_SUPPORT_WRITE Task-number: 241223 Reviewed-by: Espen Riskedal
* | Fix QScriptEngineAgent::functionExit (JIT enabled)Jedrzej Nowacki2009-09-072-1/+4
| | | | | | | | | | | | | | Event functionExit was fixed, now returnValue is correctly passed as an argument to debugger. Few QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
* | Fix QScriptEngineAgent::exceptionCatch (JIT enabled)Jedrzej Nowacki2009-09-072-1/+4
| | | | | | | | | | | | | | Event exceptionCatch fixed, now exceptionValue is correctly passed as an argument to debugger. Two QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
* | make JavaScriptCore compile on HPUXKent Hansen2009-09-077-3/+12
| | | | | | | | | | | | | | Get rid of circular dependency (don't include StructureChain.h from Structure.h). Disable some time stuff that isn't available on HPUX. Reviewed-by: Simon Hausmann
* | Few expected fails were fixed in QScriptEngineAgentJedrzej Nowacki2009-09-073-0/+15
| | | | | | | | | | | | | | | | | | functionExit event was partially fixed. The time point in JS execution with JIT enabled works now but still there is no returning value in few cases. Autotest was corrected. Reviewed-by: Kent Hansen
* | Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-09-041-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | define MAP_ANON as MAP_ANONYMOUS on HPUXKent Hansen2009-09-041-0/+3
| | | | | | | | Reviewed-by: Simon Hausmann
* | Add a way of getting the stack base on HP-UX.Thiago Macieira2009-09-041-0/+45
| | | | | | | | | | | | | | | | | | Unfortunately, HP-UX's pthread doesn't allow us to get the stack address of a running thread. We have to suspend the thread. And obviously we can't suspend ourselves. The solution is to start another thread, which suspends us, gets the stack address, and resumes.
* | Add PLATFORM(HPUX) and COMPILER(ACC) defines, for HP-UX support.Thiago Macieira2009-09-041-0/+24
| | | | | | | | | | | | | | | | | | Also add PLATFORM(IA64) and PLATFORM(HPPA), though we don't use them and probably don't need. Just in case. Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
* | Fix compilation on AIX: struct tm has no timezone information.Simon Hausmann2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 113.42: 1540-0217 (S) "tm_gmtoff" is not a member of "struct tm". "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 115.37: 1540-0217 (S) "tm_zone" is not member of "struct tm". Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h
* | Implement support for getting the stack base on AIX.Thiago Macieira2009-09-041-0/+12
| |
* | Fix compilation with xlC 7: operator-> must return a pointer-like type.Thiago Macieira2009-09-041-1/+1
| | | | | | | | "webkit/JavaScriptCore/runtime/Protect.h", line 101.17: 1540-1196 (S) The return type cannot be "JSC::JSValue" because "class JSValue" does not have an "operator->" function.
* | Work around an apparent xlC 7 bug: partial specialisation on HashMap.Thiago Macieira2009-09-041-49/+54
| | | | | | | | | | | | | | | | This problem was appearing only in the functions in the HashMap partial specialisation for Ref<T> that returned std::pair<iterator, bool>. "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h", line 205.5: 1540-1174 (S) The member "template std::pair<HashMap<RefPtr<T>,U,V,W,X>::iterator,bool> inlineAdd(const KeyType &, const MappedType &)" is not declared as a template in its containing class definition.
* | Fix compilation with xlC 7: apparently problem with nested templates.Thiago Macieira2009-09-041-20/+20
| | | | | | | | 1540-0062 (S) The incomplete class "IsConvertibleToDouble<0, char>" must not be used as a qualifier.
* | Fix compilation with Sun CC 5.9: std::pair does not call types' constructors.Thiago Macieira2009-09-041-4/+4
| | | | | | | | Error: Could not find a match for WTF::HashMap<std::pair<WTF::RefPtr<JSC::UString::Rep>, unsigned>, JSC::Structure*, JSC::StructureTransitionTableHash, JSC::StructureTransitionTableHashTraits, WTF::HashTraits<JSC::Structure*>>::remove(std::pair<JSC::UString::Rep*, unsigned>) needed in JSC::Structure::~Structure().
* | Fix compilation with Sun CC 5.9: the default constructor for ↵Thiago Macieira2009-09-043-5/+23
| | | | | | | | | | | | HashTableIteratorAdapter isn't called. "../JavaScriptCore/wtf/RefPtrHashMap.h", line 208: Error: Cannot use std::pair<WTF::HashTableIterator<WTF::RefPtr<JSC::UString::Rep>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>, WTF::PairFirstExtractor<std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, WTF::StrHash<WTF::RefPtr<JSC::UString::Rep>>, WTF::PairHashTraits<WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>, WTF::HashTraits<StaticValueEntry*>>, WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>>, bool> to initialize std::pair<WTF::HashTableIteratorAdapter<WTF::HashTable<WTF::RefPtr<JSC::UString::Rep>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>, WTF::PairFirstExtractor<std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, WTF::StrHash<WTF::RefPtr<JSC::UString::Rep>>, WTF::PairHashTraits<WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>, WTF::HashTraits<StaticValueEntry*>>, WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, bool>.
* | Fix linking with Sun CC 5.9: function pointers for extern "C" are treated ↵Thiago Macieira2009-09-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | differently The Sun CC compiler treats C functions and C++ functions differently, as if they had a different calling sequence (they don't, but they could). So if you declare a function in C++ having a function pointer as a parameter, it's understood to be C++ even if it had previously been declared as extern "C". This could be a compiler error, though. In any case, the end result is that WebKit fails to link because of an undefined reference to NPN_PluginThreadAsyncCall. "plugins/npapi.cpp", line 177: Warning (Anachronism): Formal argument 2 of type void(*)(void*) in call to WebCore::PluginMainThreadScheduler::scheduleCall(_NPP*, void(*)(void*), void*) is being passed extern "C" void(*)(void*). There are more of these errors left in WebKit, but they are not causing problems right now.
* | Fix compilation with Sun CC 5.9: ambiguity in ?:Thiago Macieira2009-09-0416-20/+20
| | | | | | | | | | | | | | | | | | | | Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<WebCore::DocumentFragment>" and third operand of type "int" can be converted to one another. Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<JSC::Label>" and third operand of type "int" can be converted to one another. [and others similar] Conflicts: src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp
* | Remove comma at end of enum. Some compilers are more picky than others.Thiago Macieira2009-09-0419-20/+21
| | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h
* | Fix compilation with Sun CC 5.9: moving elements in a vector requires source ↵Thiago Macieira2009-09-041-6/+6
| | | | | | | | | | | | | | | | | | | | not to be const I don't know why the compiler couldn't call src->~T() on a const T *src, but fact is it couldn't. In any case, since move is copying the source and deleting it, formally the argument shouldn't be const anyway.
* | Fix compilation error on Solaris: mmap/munmap take/return a char*, not void*.Thiago Macieira2009-09-042-3/+3
| | | | | | | | | | | | "../JavaScriptCore/interpreter/RegisterFile.h", line 128: Error: Using static_cast to convert from char* to JSC::Register* not allowed. Error: Formal argument 1 of type char* in call to munmap(char*, unsigned) is being passed JSC::Register*.
* | Fix linking with SunCC 5.9: de-inline the operator new and delete in ↵Thiago Macieira2009-09-042-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParserArenaDeletable. If you mark functions as "inline", the compiler doesn't have to emit out-of-line copies. What happens is that Nodes.h declares these functions, but the inline bodies are in NodeConstructors.h. ParserArena.cpp used these functions, but didn't include NodeConstructor.h. I could have added the missing #include, but this is error-prone, since you have to remember to do that. Moving the bodies into Nodes.h was also not possible, because it requires JSC::Parser to be defined and Parser.h needs to #include "Nodes.h". So the solution is to de-inline.
* | Fix oversize-buffer support for aligning.Thiago Macieira2009-09-041-3/+8
| | | | | | | | Since Vector initialises VectorBase with the value of inlineBuffer(), it does so before the m_inlineBuffer member has had a chance to initialise. This lead to dereferencing of uninitialised pointers and, as was expected, crashes.
* | build fix for winceThierry Bastian2009-09-021-0/+2
| |
* | Create exceptionCatch eventsJedrzej Nowacki2009-09-013-0/+18
| | | | | | | | | | | | | | Call to JSC::Debugger::exceptionCatch when exception is catched were added for JIT enabled. Few XFAIL were moved. Reviewed-by: Kent Hansen
* | Fix column number in QScriptEngineAgentJedrzej Nowacki2009-09-011-4/+0
| | | | | | | | | | | | | | Fix column number in QScriptEngineAgent with JIT enabled and in the same time with QT_BUILD_SCRIPT_LIB disabled Reviewed-by: Kent Hansen
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | make JIT construct objects of type QScriptObject, not JSC::JSObjectKent Hansen2009-08-261-0/+8
| | | | | | | | | | Commit 25e76959da84fe4c40f98cf32b7b8c69e5087681 changed it for the interpreter, this commit makes it work with the JIT enabled as well.
* | Compile fix for mingwThierry Bastian2009-08-262-3/+1
| |
* | Fix column number in QScriptEngineAgent with JIT enabledJedrzej Nowacki2009-08-261-0/+1
| | | | | | | | | | | | | | Column number in executed JS source code is correctly passed to debugger. Few autotest were repaired. Reviewed-by: Kent Hansen
* | Removed library added by mistake in 91e1f75992a5fa720ad748d8487a44b5a242ca2dFriedemann Kleint2009-08-251-28/+0
| |
* | Fix valgrind warning (use of uninitialized) in JavaScriptCoreOlivier Goffart2009-08-251-0/+2
| | | | | | | | Reviewed-by: Kent Hansen
* | Merge branch '4.6'Thiago Macieira2009-08-2410-88/+48
|\ \