summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-21388-36626/+17175
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-2119-184/+783
| |\ | | | | | | | | | qtscript-jsc-backend
| | * Register interpolators for math3d classesRhys Weatherley2009-08-211-1/+23
| | | | | | | | | | | | Reviewed-by: Justin McPherson
| | * Add implicit conversions from math3d classes to QVariantRhys Weatherley2009-08-2110-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | Existing QVariant-capable classes in QtGui like QColor, QPixmap, etc have "operator QVariant()". This change adds the same operators for QVector2D, QVector3D, QVector4D, QQuaternion, and QMatrix4x4. Reviewed-by: Justin McPherson
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-08-202-8/+15
| | |\
| | | * Force rasterfallbacks with a env variable in dfbAnders Bakken2009-08-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If qgetenv("QT_DIRECTFB_FORCE_RASTER").toInt() > 0 all paint operations will fall back to the raster engine in DirectFB. Good trick for debugging. I hijacked the compositionModeStatus variable for this since it's checked for every paint operation anyway and I didn't want to introduce any overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Support RGB32 in DirectFB againAnders Bakken2009-08-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I make sure all surfaces that Qt may paint on are ARGB instead of RGB32 the problem that was solved by cef63710576571405b4eed7b225e6c895a633d6a is still solved. Reviewed-by: Donald <qt-info@nokia.com>
| | * | Merge branch 'kinetic-transform' of git@scm.dev.nokia.troll.no:qt/kineticRhys Weatherley2009-08-208-175/+687
| | |\ \ | | | |/ | | |/|
| | | * Fix sub-attaq after the QGraphicsTransform changesRhys Weatherley2009-08-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Benchmarks comparing QMatrix4x4 with QTransformRhys Weatherley2009-08-201-0/+411
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Remove QGraphicsTransform::project()Rhys Weatherley2009-08-194-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | QMatrix4x4::toTransform() now does what project() used to do. Reviewed-by: trustme
| | | * Add projection support to QMatrix4x4::toTransform()Rhys Weatherley2009-08-192-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting from 3D back to 2D, it is necessary to project the z component unless an orthographic projection is desired. This change adds a distanceToPlane argument that specifies the perspective projection factor to apply during the conversion. The default value of 1024 corresponds to the projection performed by QTransform::rotate(), for consistency with existing classes. Reviewed-by: trustme
| | | * Fix comment for QGraphicsTransform::project()Rhys Weatherley2009-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Minor error in the documentation for the projection matrix. Reviewed-by: trustme
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-transformRhys Weatherley2009-08-192-0/+10
| | | |\
| | | * | Re-implement QGraphicsTransform to use QMatrix4x4Rhys Weatherley2009-08-194-165/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTransform-based transformations create problems when performing X and Y axis rotations because they aren't using true 3D. This change modifies QGraphicsTransform and its sub-classes to use QMatrix4x4 as the standard transformation matrix, with a project() function to project back to 2D when required. Reviewed-by: trustme
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-2082-1393/+2134
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
| | * | | Add value_type definition for STL compatibility.David Faure2009-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes compilation of std::back_inserter(myQByteArray) when compiling with "-std=c++0x -pedantic". Some code (ifdef'ed with CXX0X) in stl_iterator.h uses value_type. Can't hurt to define it, even if the code is marked experimental. gcc 4.3.3, libstdc++6-4.3. Merge-request: 1286 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | Respect SmoothPixmapTransform in dfbpeAnders Bakken2009-08-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the renderHint SmoothPixmapTransform is set and a drawPixmap/drawTiledPixmap/fillRect(QBrush(QPixmap)) includes a scale we should fall back to raster engine. Reviewed-by: Donald <qt-info@nokia.com>
| | * | | Fix undo/redo of single-command edit blocksmae2009-08-202-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (with QTextCursor::beginEditBlock() and QTextCursor::endEditBlock()) Previously QTextDocument would treat single command blocks as if there was no block, i.e. command compression would occur, causing tst_QTextDocument::testUndoBlocks() to fail. The patch completes the insufficient block-flag of QTextUndoCommand with an addition flag block_end. The block-flag itself is renamed to block_part. Reviewed-by: con
| | * | | Extend testUndoBlock() with a single command block insertmae2009-08-201-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test a newly discovered bug when a beginEditBlock()/endEditoBlock() contains only one single insertion command. It should still be treated as an undo block of its own.
| | * | | split the qstringbuilder autotest into fourhjk2009-08-2015-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Some S60 and WinCE test scripts prefer to have only one executable per directory.
| * | | | implement registered script values as a doubly linked listKent Hansen2009-08-204-13/+33
| | | | | | | | | | | | | | | | | | | | It's faster.
| * | | | use a list to keep track of registered script valuesKent Hansen2009-08-205-118/+41
| | | | | | | | | | | | | | | | | | | | Get rid of the hash.
| * | | | store the engine's d-pointer in QScriptValuePrivateKent Hansen2009-08-203-150/+115
| | | | | | | | | | | | | | | | | | | | | | | | | It's the d-pointer that we most frequently want to access, so store it to avoid having to use QScriptEnginePrivate::get() all over the place.
| * | | | Remove useless variable from Lexer.Jedrzej Nowacki2009-08-201-3/+2
| | | | |
| * | | | QEXPECT_FAIL was removed.Jedrzej Nowacki2009-08-201-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotest's correction after 3062cd6395ba13746aea452eb53447d915184e2d Column numbers are calculated corectly Reviewed-by: Kent Hansen
| * | | | Fix JavaScriptCore::Lexer column countJedrzej Nowacki2009-08-202-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Column number is rest after each new line character in the source code. Reviewed-by: Kent Hansen
| * | | | remove redundant variableKent Hansen2009-08-202-10/+3
| | | | |
| * | | | remove unused variableKent Hansen2009-08-201-1/+0
| | | | |
| * | | | only create and attach the script debugger if it's actually requestedKent Hansen2009-08-201-11/+16
| | | | |
| * | | | add recursion guard for GC markingKent Hansen2009-08-203-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To achieve behavior of the old back-end. There, the recursion guard was automatic because a mark flag was set on the object as soon as marking begun, but in JSC it appears to only be set _after_ the marking is completed.
| * | | | provide line number information for innermost call frameKent Hansen2009-08-204-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | For the innermost frame, we don't have a returnPC, so use the line number that was last passed to the engine agent.
| * | | | provide filename in stack view if we have itKent Hansen2009-08-201-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the JSC back-end it's currently possible that we know the file name, but not the line number (we can't just assume that lineNumber == -1 implies native function).
| * | | | set the current frame when getting callbacks in JSC DebuggerKent Hansen2009-08-203-30/+42
| | | | | | | | | | | | | | | | | | | | | | | | | If the debugger stops execution, we want the frame pointer to be in sync (so we get the full backtrace).
| * | | | disable executable line number info since we don't have it yetKent Hansen2009-08-202-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | The old back-end relied on a script-to-XML converter to get information about the script, but it's not implemented yet in the new back-end.
| * | | | make QScriptEngine::objectById() workKent Hansen2009-08-202-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | It needs to work even when there is no public QScriptValue that holds a reference to the object.
| * | | | Fix "fixme" in QtFunction::mark()Jedrzej Nowacki2009-08-201-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtFunction::mark() does not cause infinite recursion any more. Reviewed-by: Kent Hansen
| * | | | add missing includeKent Hansen2009-08-201-0/+1
| | | | |
| * | | | Fix JavaScriptCore build on systems without anonymous mmappingNorbert Leser2009-08-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fastMalloc when neither MMAP nor VIRTUALALLOC are enabled RegisterFile constructor currently throws #error when both MMAP and VIRTUALALLOC conditions fail. On any platform that does not provide these features (for instance, Symbian), the fallback should be regular malloc (or fastMalloc). It is functionally equivalent in this case, even though it may have certain drawbacks such as lack of dynamic pre-allocation. Taken upstream from https://bugs.webkit.org/show_bug.cgi?id=27051 Reviewed-by: Simon Hausmann
| * | | | only enable QtScript on platforms where WebKit can be builtKent Hansen2009-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | QtScript needs to build JavaScriptCore (part of WebKit). If WebKit can't be built, we assume that JavaScriptCore can't be built.
| * | | | add platforms AIX and HPUXKent Hansen2009-08-201-1/+35
| | | | | | | | | | | | | | | | | | | | Also add some compilers, and define PLATFORM(UNIX) on Solaris.
| * | | | use PLATFORM(SOLARIS) instead of Qt-specific defineKent Hansen2009-08-202-2/+2
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-2086-992/+2749
| |\ \ \ \ | | | | | | | | | | | | | | | | | | qtscript-jsc-backend
| * | | | | Do not pass JSValue per const referenceOlivier Goffart2009-08-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | It is a POD with the size of a pointer
| * | | | | CleanupsOlivier Goffart2009-08-193-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless variable. Use QBoolBlocker instread of custom QScript::InEval.
| * | | | | invalidate wrapped JSC::JSValue when script engine is deletedKent Hansen2009-08-192-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we will crash if someone tries to do something with the value.
| * | | | | Fix QScriptValue::objectId().Jedrzej Nowacki2009-08-195-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptValue id were made persistent. It depands on JSC:JSValue JSCell pointer not on QScriptValuePrivate attr. Reviewed-by: Kent Hansen
| * | | | | add more detailed tests for QRegExp <--> JS RegExp conversionKent Hansen2009-08-191-1/+19
| | | | | |
| * | | | | remove expected failureKent Hansen2009-08-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Works as of commit 5bca43cca3ac90429e3f9263d0d7ea8c9eb164d4.
| * | | | | add test to make sure a JavaScript object's ID persistsKent Hansen2009-08-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the QScriptValue is destroyed, the underlying ID should not change; e.g. if a new QScriptValue is created and wraps the same object, the ID should be the same as before.
generated by cgit v0.12 at 2025-01-04 04:06:05 (GMT)