summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QtScript: Add yet more missing API shimsKent Hansen2010-03-264-4/+65
| | | | | | | | | | | | | | | | - for QScriptEngine and QScriptContext; we don't control what the JSC functions are doing, so it's better to have shims than not to have them (which can cause something to blow up), even if they might not be strictly necessary as of this writing. - for QScriptDeclarativeClass; otherwise the identifiers might be created/destroyed in the wrong engine. - for QScriptValueIterator destructor; otherwise the identifiers might be destroyed in the wrong engine. This is an attempt to fix a crash in Bauhaus, but it might still be crashing (i.e. still some shims missing, somewhere) ;(
* QtScript: Make sure the old identifier table is restoredKent Hansen2010-03-263-3/+6
| | | | Use a shim to take care of that.
* Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
| | | | | Merge-request: 528 Reviewed-by: Zeno Albisser
* uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-268-7/+20
| | | | | | | | | | | | | | Add magic header '/* XPM */' and turn off wrapping of lines that broke image readers. Add a command line option to activate line-wrapping in case someone exclusively wants to use the extracted images for embedding in code. Also do line-wrapping in case images are embedded into the ui-file. Note: The current versions of MSVC do not seem to have a limitation of line lengths any more. Task-number: QTBUG-9207 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-263-3/+8
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Qualify ptrdiff_t's namespace in stltest configure test Fix the bug where the ampersand symbol would be discarded. QtScript: Add missing API shim for signal handling Designer: Fix broken resource view filtering.
| * Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-262-3/+7
| | | | | | | | | | | | | | | | We are now checking that the QAction is not related to the About or Quit button on Mac OS X Task-number: QTBUG-7540 Reviewed-by: Morten Sorvig
| * QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
| | | | | | | | | | | | The signal handling bypasses the public QScriptValue API (it calls JSC::call() directly), hence we need to insert a shim to make sure that the correct identifier table will be used.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-268-38/+95
|\ \ | |/ |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Don't specify a BottomToTop scan line direction for YUV frames. Support expanding aspect ratio in direct show video window control. Support the Expanding aspect ratio mode in the gstreamer window control.
| * Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | | | | | | | | | | | | A positive image height is supposed to indicate BottomToTop scan line direction, but this would seem to be true for RGB formats. Reviewed-by: Dmytro Poplavskiy
| * Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| * Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| | | | | | | | | | Reviewed-by: Dmytro Poplavskiy Task-number: QTBUG-9118
* | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| | | | | | | | open is public.
* | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptEngine::reportAdditionalMemoryCost(int). This function provides the ability to give a hint to the engine that it should perhaps trigger garbage collection sooner rather than later. For example, if you've implemented a JS ByteArray class that wraps a QByteArray, and a user constructs a few hundred temporary ByteArray objects of large sizes, failure to report the additional memory cost may cause the application's memory consumption to grow and grow (because the script engine thinks they are "cheap" objects, the GC won't kick in). Reporting the correct size can be difficult (or impossible) in some cases. For example, it's difficult to predict the total amount of system memory & resources consumed by a QImage. But even reporting a heuristic / approximate cost can be better than reporting no cost. Task-number: QTBUG-6238 Reviewed-by: Simon Hausmann
* | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | | | | | | | Reviewed-by: Morten Sorvig
* | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-2579-1242/+1127
|\ \
| * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-252-9/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rename loopCount to loops, in line with other declarative elements.
| | | * Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| | * | Doc fix.Michael Brasser2010-03-253-3/+3
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2510-38/+81
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-257-34/+50
| | | |\ \
| | | | * | Replace Animation's repeat property with loops.Michael Brasser2010-03-257-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
| | | * | | Ensure currentIndex is updated when items inserted before currentIndexMartin Jones2010-03-252-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was occurring when items inserted but no items had been created yet. Task-number: QTBUG-9313
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2410-23/+33
| | | |\ \ \
| | | * | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| | | | | | |
| | * | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-9336
| | * | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | | |/ / | | |/| |
| | * | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-249-23/+23
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | * | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | |/ | | |/| | | | | | | | | Task-number: QTBUG-9312
| | * | Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| | * | | Fix leak.Michael Brasser2010-03-241-1/+2
| | | | |
| | * | | StateChangeScript doc.Michael Brasser2010-03-241-2/+24
| | | | |
| | * | | A StateChangeScript should never be run when leaving the state.Michael Brasser2010-03-242-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | For a Transition running in reverse, stop ScriptAction from running any StateSchageScripts.
| | * | | ScriptAction doc.Michael Brasser2010-03-241-0/+31
| | | | |
| | * | | Rename stateChangeScriptName to scriptName.Michael Brasser2010-03-243-3/+4
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2416-203/+185
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2411-92/+175
| | | |\ \ \
| | | | * | | Fix abort in flipableLeonardo Sobral Cunha2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable was calling updateSceneTransformFromParent, but this can only called when the the parent's scene transform is guaranteed to be updated, which is not the case in flipable. Task-number: QTBUG-8474 Reviewed-by: bnilsen
| | | | * | | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52
| | | | | | |
| | | | * | | Properly use one thread for all instances of XmlListModel.Bea Lam2010-03-242-83/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
| | | * | | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
| | | * | | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-246-55/+0
| | | |/ / /
| | | * | | Make compile.Michael Brasser2010-03-241-1/+1
| | | | | |
| | | * | | Output all Loader errors.Michael Brasser2010-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were not outputting those that occurred on component->create().
| | | * | | Fix Loader leak when loading a non-QGraphicsObject object.Michael Brasser2010-03-241-1/+5
| | | | | |
| | | * | | Use setParent_NoEvent in Loader and benchmark Loader performance.Michael Brasser2010-03-241-2/+3
| | | | | |
| | | * | | Animation construction optimization.Michael Brasser2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use setParent_NoEvent when parenting to group.
| | | * | | Origin safety testing for imported resources.Warwick Allison2010-03-245-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
generated by cgit v0.12 at 2024-12-28 02:06:48 (GMT)