summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-0/+2
|\ | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smart installer packages bundle normal application sis with a bootstrap package that will download a smart installer when the package is installed. Smart installer in turn will download any dependencies of the application that are available on remote server, such as Open C, Qt, and QtWebkit packages, and install them Smart installer packages are generated when DEPLOYMENT.installer_header variable is defined in applicatoin .pro file. This commit is still missing properly signed bootstrap.sis package. Task-number: QTBUG-7908 Reviewed-by: Shane Kearns
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-1/+1
| | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-012-1/+12
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-01-252-1/+12
| | | | | | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
* | Merge branch '4.6'Thiago Macieira2010-01-215-5/+156
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * Add proper license headers to new files.Thiago Macieira2010-01-182-0/+82
| | | | | | | | Reviewed-by: Trust Me
| * Change the prefered content size of the anomaly browserBenjamin Poulain2010-01-181-0/+2
| | | | | | | | | | Having the prefered content size equals to the screen size gives some bad layout on devices.
| * Avoid painting while loading in the anomaly demo browserBenjamin Poulain2010-01-185-5/+72
| | | | | | | | | | | | At load time, loading, layouting and painting are fighting for the CPU. By skipping painting and layouting, we achieve a better loading time, and the experience is better.
* | Merge branch '4.6'Thiago Macieira2010-01-13267-276/+276
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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 branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-09267-276/+276
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-2/+4
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-9/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe
| | * | Update copyright year to 2010Jason McDonald2010-01-06267-267/+267
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.6'Thiago Macieira2010-01-122-5/+12
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-072-5/+12
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Deploy sqlite3.sis instead of sqlite3.dll in Symbian Separated "make run" and "make runonphone" targets Added UIDs and icons to some webkit examples Implemented node disconnection in Phonon MMF backend Removed dead code from Phonon MMF backend Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark. Implemented support for playlist handling in Phonon MMF backend Mediaplayer: enqueue all entries from .ram file before starting playback Changed call sequence of seeking in Phonon MMF backend, for streaming Implemented buffer status notifications in Phonon MMF backend Added support for streaming playback to Phonon MMF backend Phonon MMF: leaves during object construction throw exceptions Removed stale TODO comments from Phonon MMF backend Symbian: More i18n strings work. Fixed bug which caused Phonon backend error messages to be suppressed Added error strings to Phonon MMF backend
| | * | Merge branch 'mmfphonon' into 4.6Gareth Stockwell2010-01-062-5/+12
| | |\ \ | | | |/ | | |/|
| | | * Mediaplayer: enqueue all entries from .ram file before starting playbackGareth Stockwell2009-12-082-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that Phonon::MediaObject::setNextSource is called before the first clip finishes playback, and therefore that the next clip is played once the first finishes. Reviewed-by: Frans Englich
* | | | Merge branch '4.6'Thiago Macieira2010-01-081-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Apparently glLoadMatrixf doesn't load the supplied data synchronously in certain drivers, so we make the arrays static to work around this issue. Really a GL driver bug but it's quite simple to work around it in this case. Reviewed-by: Kim
* | | Merge branch '4.6'Thiago Macieira2010-01-052-110/+182
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | | | | | | | | | | | | | | | | | Change the behavior of the scrolling so it is more usable on small devices. Add a code path for accelerating the autoscrolling if paning over a auto-scrolling frame.
| * | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
* | | Merge branch '4.6'Thiago Macieira2009-12-264-92/+91
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | Fix a bug in resizing the anomaly browser demo.Benjamin Poulain2009-12-181-2/+3
| | | | | | | | | | | | | | | The sliding surface does not move, the position of the children must be used to find the correct layout.
| * | Improve the performance of the Anomaly browser demoBenjamin Poulain2009-12-182-88/+70
| | | | | | | | | | | | | | | | | | | | | | | | Some minor changes to improve the demo: -use QUrl::fromUserInput() -scroll a surface instead of moving the widgets to minimize the repaint -use the animation framework instead of QTimeLine
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-171-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: WeatherInfo now shows Oslo info upon launch instead of blank screen Fixed QCoeFepInputContext::widgetDestroyed
| | * | WeatherInfo now shows Oslo info upon launch instead of blank screenMiikka Heikkinen2009-12-171-2/+1
| | |/ | | | | | | | | | | | | Task-number: QTBUG-6367 Reviewed-by: Janne Anttila
| * | Removed the chip demo for windows CEninerider2009-12-141-2/+19
| |/ | | | | | | | | | | | | | | The chip demo causes a memory exception on most Windows CE devices. For now we simply will not include this demo in the package for Windows CE. In the future a specialized version might be created. Reviewed-by: Maurice
* | Merge branch '4.6'Thiago Macieira2009-12-023-261/+345
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Adjust qmediaplayer's settings dialog for small screens.Frans Englich2009-11-251-160/+191
| | | | | | | | | | | | | | | | Patch done jointly by me and Jan-arve. Task-number: QTBUG-4725 Reviewed-by: Jan-Arve Sæther Reviewed-by: Frans Englich
| * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-231-0/+1
| |\
| * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-2031-228/+260
| |\ \ | | | | | | | | | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| * | | Added additional keyboard shortcuts to MediaPlayerGareth Stockwell2009-11-191-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These shortcuts are used for pausing video playback while in full-screen mode, and for exiting full-screen mode. They are for non-QWERTY mobile devices, which lack keys mapping to the previously existing shortcut keycodes. Reviewed-by: Frans Englich
| * | | Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-192-90/+128
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5586 Reviewed-by: Frans Englich
| * | | Mediaplayer: do not exit full-screen when pausedGareth Stockwell2009-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the patch which introduced "exit full screen when end of playback is reached": f9d36789 Reviewed-by: Frans Englich
| * | | qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-162-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmediaplayer when popping up dialogs shouldn't: * play when it's paused * pause when playing only audio Task-number: QTBUG-5851 Reviewed-by: Gareth Stockwell
* | | | Merge branch '4.6'Thiago Macieira2009-11-2532-231/+285
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-233-0/+51
| |\ \ \ | | | |/ | | |/| | | | | 4.6-staging2
| | * | Add support for opening Real Media RAM files.Frans Englich2009-11-202-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by Nokia Dallas/Helix team. Patch supplied by Fu Liz EXT-DextraTech/Dallas, minor changes by me. Task-number: QTBUG-4882 Reviewed-by: Gareth Stockwell
| | * | Symbian: Add capability NetworkServices.Frans Englich2009-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | From discussions with Helix team. Reviewed-by: Gareth Stockwell
| * | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-202-9/+35
| |\ \ \ | | |/ /
| | * | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICON keyword can be used without UID, since .mif filename is generated based on target instead of UID3 nowadays Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| | * | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-192-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe
| * | | Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| |/ / | | | | | | | | | Reviewed-by: TrustMe
| * | Ran the script utils/normalizeOlivier Goffart2009-11-1822-173/+173
| | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-181-1/+1
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila
| * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-172-43/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-173-1/+23
| | |\ \
generated by cgit v0.12 at 2024-12-25 07:33:26 (GMT)