summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove the nonfunctional googlechat exampleAndras Becsi2012-11-266-530/+0
| | | | | | | | | | | The example utilizes the Google Talk Gadget service which has been discontinued as of May 2012. http://support.google.com/talk/answer/2722317?hl=en Change-Id: Iae6f500bef2374c11c4476be2d4fb658f7dd8bf4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Example: Set qt-project.org as home for the Browser exampleCaroline Chao2012-11-162-8/+8
| | | | | | | | And update other links. Change-Id: I45815e085e2e465568f8b23a551b1123797360c3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix UI glitches in the youtube exampleAndras Becsi2012-11-131-19/+16
| | | | | | | | | | | The MouseArea that is responsible for showing and hiding the thumbnail list should fill the area showing the title of the current video and it should be sufficiently big. This area somehow ended up being a narrow stripe detached from the top edge of the content. Change-Id: Id370584edc7d780e957fa7b4457518ad6f854740 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix the detection of the uitools module for the browser exampleAndras Becsi2012-11-131-1/+1
| | | | | | | This fixes the build if uitools is not available. Change-Id: If81d1167cdc9318b91add532e44297dbf7d13237 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Remove obsolete symbian settings from examples' project filesAndras Becsi2012-11-1311-57/+0
| | | | | Change-Id: If60dfa462f45d23edcf47dc647035bbe12d54459 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Browser example: update bookmarksCaroline Chao2012-11-092-8/+8
| | | | | | | Replace links pointing to Nokia with Digia's. Change-Id: Ia9736783ee57c9840191ea55d3d5eadade2cdaa7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* CONFIG+=uitools is deprecated. Use QT+=uitools insteadv5.0.0-beta2Sergio Ahumada2012-11-071-1/+1
| | | | | Change-Id: I610a5ad076e7805a6c10ad60b8e69cff2d871a87 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Simplify regexp usageSimon Hausmann2012-11-071-2/+1
| | | | | | | | JS has built-in support for regular expressions, so we don't need to allocate a new RegExp object for each resource request. Change-Id: I7d669252ab60264dc6c7c45de3b7f5c9f74c9158 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix build with latest qtbase and webkitSimon Hausmann2012-10-233-7/+2
| | | | | | | | Don't try to include QPlastiqueStyle, remove dead code. Use webkitwidgets instead of webkit with QT Change-Id: Ief6076755b823887e595d947783343f087ed46d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Prospective fix for build in CI systemSimon Hausmann2012-10-231-0/+2
| | | | | | | Add qtjsbackend and qttools as dependency Change-Id: Idc128c677d91ecd36491f8f49904113e5657c104 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix license headersSimon Hausmann2012-10-235-145/+140
| | | | | Change-Id: I01e58f6f32e62bc5bd4338c72d06a70ab4c480da Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add QML examples for WebKit integrationAndras Becsi2012-10-2221-1/+1181
| | | | | | | | | | | | | | | | | | | Add flickrview and youtubeview examples covering the use of the WebKit WebView QML API. - FlickrView is an example that utilizes the flickr.com RSS feed of public photos and displays the full size images in the WebView. It is also possible to browse the Flickr profile of the images. Navigaton is restricted to flickr.com. - YouTubeView is a QML example that utilizes the WebView to play HTML5 videos retrieved using the youtube API. The application has a search functionality and some preset video streams. Change-Id: I88d09e416d6791f620e0590f7b9ce8f49173e64e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Add .qmake.conf with load(qt_build_config) like other Qt modulesTor Arne Vestbø2012-10-221-0/+1
| | | | | Change-Id: I580523026d20d86c12985a39d414a1ba6a9bf8d3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Adapt to WebKit Widgets module splitSimon Hausmann2012-10-1533-35/+34
| | | | | | | | Most of these examples use the widgets API of QtWebKit and hence need the QtWebKitWidgets module. Change-Id: Ic26938561c34abd663ed438bf6c61c7dd06131fe Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24107-1763/+1763
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Idd1b38449c86b01afe20a1bdc6a05c47f546b38d Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove ambiguous argument to createIndex.Stephen Kelly2012-09-211-3/+3
| | | | | | | | | | | Currently it is a cleanup. After https://codereview.qt-project.org/#change,33286 it is a build fix. It's justified as a cleanup anyway. Change-Id: I2444a59c5eae042d4e4c7fd8dad9830578052431 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* examples: Fix some compilation errorsSergio Ahumada2012-09-2012-37/+50
| | | | | Change-Id: Ibe844411aa4c11fab9cbd73ddeb794ea2af3f54b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: Ia1b37815493768d38323a8117f3aba3b58f429fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove phonon as per removal in qt5.v5.0.0-beta1Toby Tomkins2012-08-011-1/+0
| | | | | | | | 5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5 compilation, also remove it in this repository. Change-Id: I72eefab5cd506be9d6a654f6bfb257d039213aee Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix compilation against namespaced qtOswald Buddenhagen2012-07-236-1/+16
| | | | | Change-Id: Ic208576489c57258893bdb899a4388d853f7815d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* adapt to QIcon move to QtGuiOswald Buddenhagen2012-05-214-4/+3
| | | | | Change-Id: Ic5133350753008932fe60c8a8df104280fa1472a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix.qt-v5.0.0-alpha1Friedemann Kleint2012-03-214-2/+4
| | | | | Change-Id: I9a618c9e6f60828b6eb7f1872f1c345fbdc37056 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30107-107/+107
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I72317e5c33c3d0b9e65b89f644b7673cf6525fed Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23107-107/+107
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I2f1d7bf19462c6128e600218af8b972b7685eec6 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compilationSimon Hausmann2012-01-0969-118/+123
| | | | | | | | Use QtWidgets where needed and ran fixqt4headers. Change-Id: I000b76009a1a26317d747203ebaca0ec445f8753 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-06108-108/+108
| | | | | | Change-Id: Ie6358ca2faf925104318deec944cecd0a33cea34 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
| | | | | | | Change-Id: I8d8d1fb4581c362f3f58f8c41b8c7b8589d36f3c Reviewed-on: http://codereview.qt.nokia.com/3383 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Replace outdated license headers.Jason McDonald2011-08-1562-1059/+1059
| | | | | | Change-Id: I4a703684de904e6f01b8a723dcbd024a8d6201d4 Reviewed-on: http://codereview.qt.nokia.com/2649 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Merge demos and examples.Casper van Donderen2011-07-27102-31/+29
| | | | | | | Change-Id: Id0c975a8a3be516da66561f462511e99447d6838 Reviewed-on: http://codereview.qt.nokia.com/1420 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
* Fixed compile; removed useless use of qRound(int)Rohan McGovern2011-07-261-1/+1
| | | | | | | | | | | | qRound of an integer type never made sense. Since 2dcd3939a8bd5ff743e4c87f87b2d81b1a101467 in qtbase, it won't compile any more. Change-Id: Iafbc4ec57694933810c28a2bd9aabf9d5d8bac29 Reviewed-on: http://codereview.qt.nokia.com/1906 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-7/+11
| | | | | | | | | | %dependencies now has a simpler format of gitmodule => %gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c511 Reviewed-on: http://codereview.qt.nokia.com/1286 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added dependency information to the sync.profile.axis2011-04-271-0/+11
|
* Add .gitignore to each moduleaxis2011-04-271-0/+261
|
* Adapted guiapplauncher test to modularized Qt.axis2011-04-273-0/+4
| | | | | Now it reads the test cases from text files in each repository instead.
* Added missing header to webkit example.axis2011-04-271-0/+1
|
* Moved to using a feature profile instead of direct inclusion.axis2011-04-2710-10/+10
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27181-0/+22522
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
View Lorry Controller Status