summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile on Maemo 5Harald Fernengel2010-03-261-2/+3
| | | | | | qmake for Maemo 5 needs to be bootstrapped with an older gcc, which doesn't like foreach() in templates. Use a traditional for loop to iterate over the container instead.
* 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-2610-7/+22
| | | | | | | | | | | | | | 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-265-5/+10
|\ | | | | | | | | | | | | | | | | | | 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.
| * Qualify ptrdiff_t's namespace in stltest configure testJoão Abecasis2010-03-261-1/+1
| | | | | | | | | | Reviewed-by: Thiago Macieira Task-number: QTBUG-9046
| * 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.
| * Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
| | | | | | | | | | | | | | Another side effect of 62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b . Task-number: QTBUG-9262 Initial-patch-by: Jarek Kobus <jkobus@trolltech.com>
* | 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-263-7/+29
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: specify the configuration's purpose based on security mode of network.
| * | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| | | | | | | | | | | | open is public.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-25284-13972/+13784
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits) Use QTRY_COMPARE after QTest::qWaitForWindowShown() Use the new memory cost reporting API in QtScript Custom Class example QtScript: Add API for reporting additional memory costs Add experimental support for StaticContents in Mac OS X. Fix misspelling in function name. don't just return the first key here. Fix CI sytem build breakage. Fix crash. Compile with QT_NO_NETWORKINTERFACE defined. Don't emit signals in constructor. Remove unused code. fix multiple promps for keychain access when connecting to wifi network not all interfaces should be active Update changelog Fix qcombobox:flaggedItems autotest failure. Wrong value for PM_ScrollBarExtent on Windows XP. doc: Fixed all the remaining qdoc errors. For now. Do not move keyboard focus to invisible windows on X11. Do not use _NET_ACTIVE_WINDOW for nonmanaged windows. Revert "Revert "Make QWidget::activateWindow() NET window manager aware."" ...
| * Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | | | | | | | | | Apparently it's possible that the window has been shown but haven't received a paint event yet.
| * Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | | | | | | | Also describe its purpose in the example doc.
| * QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25226-3447/+2531
| |\
| | * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | |\ | |_|/ |/| | | | | | | | | | | 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-253-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-253-13/+13
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25223-3435/+2519
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits) Qt.Infinite -> Animation.Infinite Doc fix. Skip tests for now Make autotest work on windows. Remove faulty assert - the precondition is checked for correctly later on Ensure currentIndex is updated when items inserted before currentIndex Replace Animation's repeat property with loops. Fix compile in namespace. Compile with qtnamespace Disallow the implicit QDeclarativeGuardedContextData copy constructor Doc Fix leak. StateChangeScript doc. A StateChangeScript should never be run when leaving the state. ScriptAction doc. Rename stateChangeScriptName to scriptName. Doc Document QML security considerations. Fix flicking views at boundary with StricthighlighRange Fix abort in flipable ...
| * | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2540-55/+91
| | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * | | Doc fix.Michael Brasser2010-03-253-3/+3
| | | |
| * | | Skip tests for nowBea Lam2010-03-251-0/+4
| | | |
| * | | Make autotest work on windows.Martin Jones2010-03-251-2/+5
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2540-81/+124
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2537-77/+93
| | |\ \ \
| | | * | | Replace Animation's repeat property with loops.Michael Brasser2010-03-2537-77/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-240-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativexmllistmodel.cpp
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2414-37/+53
| | |\ \ \ \
| | * | | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| | | | | | |
| * | | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-254-3/+12
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Task-number: QTBUG-9336
| * | | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ / / | |/| | |
| * | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2412-37/+42
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| * | | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9312
| * | | | DocAaron Kennedy2010-03-241-0/+1
| |/ / /
| * | | 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-244-4/+5
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2435-599/+744
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2415-341/+92
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2413-94/+254
| | | |\ \ \ \
generated by cgit v0.12 at 2024-11-15 23:20:55 (GMT)