summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-102-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (104 commits) Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Remove the installer from the Qt sources. Don't remove all dependencies when patching the pkg. Fixes qabstractslider autotest Workaround for abld toolchain issue with s60main Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Enabling runfast mode when vfpv2 used. Fixing a test case to be runnable on Symbian device. [CRASH] audioinput and audiooutput examples crash when no devices are Fixed casual crash in initializeDb (Symbian) Fixes scrolling horizontally with a mouse wheel over sliders. don't use QKeySequence::mnemonic() after all Fixed qt_x11_wait_for_window_manager Revert change 34f1758 on non-Synbian platforms Fixed QGifHandler::loopCount(). Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) don't use stylesheet for just making labels bold ...
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-092-0/+6
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-02-076-8/+8
| | |\
| | * | [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-072-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | available. Task-number:QTBUG-7783 Reviewed-by:Justin McPherson
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-091-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix for embedded. Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| * | | Fixed draggabletext example.Denis Dzyubenko2010-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example expects that you can only move items around inside the same application. However when dragging items to another application it is allowed to either move or copy items. Mouse cursors during the DND should respect that. Reviewed-by: Bradley T. Hughes
* | | | Compile fixes.ck2010-02-082-0/+6
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-0/+269
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | | Update QTestLib documentation with chart use case.Fabien Freling2010-02-041-0/+269
| | | |
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-045-5/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-034-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: revert to fromUtf16() usage in fromWCharArray() Assistant examples: Fix missing QLatin1String. Added Czech translations. Webkit: Fix missing namespace. qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * | | Assistant examples: Fix missing QLatin1String.ck2010-02-021-1/+1
| | | | |
| | * | | Assistant: Use const references in foreach loops.ck2010-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| | * | | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| | * | | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-012-2/+2
| | | |/ | | |/| | | | | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * | | Fixed compile of framecapture, simpleselector for symbian-abld winscw.Rohan McGovern2010-02-022-2/+2
| |/ / | | | | | | | | | `QT += network' is required to find the network headers.
* | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-044-209/+72
| |/ |/| | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0111-14/+17
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * googlesuggest example: Add newline to end of fileMarkus Goetz2010-01-282-2/+4
| | | | | | | | Reviewed-by: TrustMe
| * Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-287-10/+11
| | | | | | | | Reviewed-by: Peter Hartmann
| * Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-262-2/+2
| | | | | | | | | | | | | | | | If you use refs, then you can't use this operator as the first argument, since qDebug() returns QDebug by-value (an rvalue temporary). That cannot be bound to a non-const ref. Task-number: QTBUG-7593
* | Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-293-1/+209
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: examples/dbus/dbus-chat/chat_adaptor.cpp examples/dbus/dbus-chat/chat_adaptor.h examples/dbus/dbus-chat/chat_interface.cpp examples/dbus/dbus-chat/chat_interface.h examples/dbus/remotecontrolledcar/car/car_adaptor.cpp examples/dbus/remotecontrolledcar/controller/car_interface.cpp
| * | Fix build due to missing auto-generated files on dbus exampleAdemar de Souza Reis Jr2010-01-292-0/+208
| | | | | | | | | | | | | | | | | | | | | Breakage introduced by my previous commit: a1c6fdf0fe5a51b5955ea3fc5f6c3eceee24e0f8 Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * | examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2010-01-299-239/+26
| | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| * | examples/dbus: update dbus-chat adaptor/interface filesAdemar de Souza Reis Jr2010-01-294-26/+23
| | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
* | | Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-2813-265/+49
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: examples/dbus/dbus-chat/chat_adaptor.cpp examples/dbus/dbus-chat/chat_adaptor.h examples/dbus/dbus-chat/chat_interface.cpp examples/dbus/dbus-chat/chat_interface.h examples/dbus/remotecontrolledcar/car/car_adaptor.cpp examples/dbus/remotecontrolledcar/car/car_adaptor_p.h examples/dbus/remotecontrolledcar/controller/car_interface.cpp examples/dbus/remotecontrolledcar/controller/car_interface_p.h
| * | examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2009-12-039-239/+26
| | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| * | examples/dbus: update dbus-chat adaptor/interface filesAdemar de Souza Reis Jr2009-12-034-26/+23
| | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
* | | Standard dialogs example does not respect non-native flagRichard Moe Gustavsen2010-01-221-1/+6
| | | | | | | | | | | | | | | | | | When showing a colordialog from the example, it does not check if the 'use native dialogs' checkbox is checked. This patch makes sure it does
* | | Merge branch '4.6'Thiago Macieira2010-01-185-172/+174
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-143-12/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Revert "Frequency to SampleRate and channels to channelCount." missed Revert "Frequency to SampleRate and channels to channelCount." Revert "Added setChannelCount() to QAudioFormat."
| | * | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
| | * | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-143-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-135-20/+31
| |\ \ \
| * | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-117-18/+34
| |\ \ \ \
| * | | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch '4.6'Thiago Macieira2010-01-131116-1221/+1236
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131121-1225/+1241
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| | * | | | Modifies the google chat example to use the DOM APIPierre Rossi2010-01-123-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that it's there, we might as well use it! Reviewed-by: Benjamin Poulain
| | * | | | Added the 'framecapture' WebKit example to the default build.Andre Pedralho2010-01-111-1/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge-request: 2235 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Simon Hausmann
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-091119-1206/+1210
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-16/+16
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-071119-1140/+1140
| | | |\ \ \
| | | | * | | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-062-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe
| | | | * | | Update copyright year to 2010Jason McDonald2010-01-061119-1127/+1127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
| | | |/ / / | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-091-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Doc typos fixed Translations: Update German for 4.6.1 fix test under windows don't complain about unresolved base when the reference is absolute make the lupdate tests more verbose in case of failure don't use qmake for test setup move equivalent of output_ts test to good/ look for the .result file in the dir where the output is expected to go fix sametext and number heuristics fix number heuristics, part 1 no point in specifying -ts when a .pro file is specified clean up the lupdatecmd files tidy up the test .pro files remove dead code
| | * | | | Doc typos fixedJarek Kobus2010-01-081-1/+0
| | | |/ / | | |/| | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | | | Merge branch '4.6'Thiago Macieira2010-01-124-2/+18
|\ \ \ \ \ | |/ / / /
generated by cgit v0.12 at 2024-12-06 13:43:28 (GMT)