summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove qtdemo from gitignorev5.4.0-rc1v5.4.0-beta1v5.4.05.4.0Rainer Keller2014-09-251-1/+0
| | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: I6e0f6297dd39becd516bcbaf94bd1c1fc47f5767 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iefeecd286820593600dbd4bee5040977d42bdfc3
| * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | Change-Id: I255ebe9805cb02abaa6f04af816fc5843f3a96c3
* | Fix build of browser example with QT_NO_CLIPBOARDv5.4.0-alpha1Allan Sandfeld Jensen2014-09-033-0/+6
| | | | | | | | | | Change-Id: I408581c6fa655accc22830ed4fb2897a7651dba4 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Doc: List more file types as example filesTopi Reinio2014-08-291-0/+2
| | | | | | | | | | | | | | | | | | Include some additional (text-format) file types to list as part of the examples. Task-number: QTBUG-40831 Change-Id: Ieca52310b1d847bf6c7a2fc4aacb1e4b9f603767 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Update license headers and add new licensesJani Heikkinen2014-08-2465-1175/+1658
| | | | | | | | | | | | | | - Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-091-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I160d518ad0bbe998916433a9cf25b0dfd63222a8 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idc42f077fca0721dca29de4a8077b2ca84bc7884
| * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I5734fa7b08bb3bd94ebf5e841bcb72bc9e074e5b
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-146-40/+108
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If9c3bf3632b0203818aefd12a973f08d60908c91
| * Merge remote-tracking branch 'origin/release' into stablev5.3.1stable5.3.1Jani Heikkinen2014-04-236-40/+108
| |\ | | | | | | | | | Change-Id: Ic2230a86eb0dda83681f3d400367564ad7b594ad
| | * Fix up Fancy Browser example.v5.3.0-rc1v5.3.0releasebaserock/v5.3.05.3.0Michael Brüning2014-04-141-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent leaking of MainWindow. * Use proper command line argument parsing. * Make the Qt project page the default page. Task-number: QTBUG-38069 Change-Id: I6142ca207e659e47136e47e4d5817dfa617677e8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| | * Fix up tabbed browser example.Michael Brüning2014-04-145-34/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replaces deprecated Q_WS_MAC preprocessor defines. * Adds a command line parser. * Adds Digia Qt home page to the default bookmarks. * Removes dead Q_WS_QWS flagged code. Task-number: QTBUG-38069 Change-Id: If4ef67434c76c2ea096fa1250a9ffaa0e53e47dd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| |/ | | | | | | | | Change-Id: Ie7b295760ee91612fa741e1a95323fce2db6e0a7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-012-3/+3
|\ \ | |/ | | | | Change-Id: I7536b96428331f5da97ccd8108316e1fd1fecf9b
| * Doc: Fix most of the documentation warningsSergio Ahumada2014-03-272-3/+3
| | | | | | | | | | | | | | | | | | - adding missing index files to \depends - fix warning: Can't link to 'The QtWebKit Bridge' Change-Id: I60665627f1aadbf7bd8a20ddda7d22db9ad694dc Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Remove nonexistent qtwebkitwidgets referenceSergio Ahumada2014-03-261-1/+1
| | | | | | | | | | | | | | | | There is no such qtwebkitwidgets.index file to be used in \depends Change-Id: I191801d22d908721e8d65b610f684c23b7dc7870 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-1/+1
|\ \ | |/ | | | | Change-Id: Ibb8862dae6dd3bb20b1be3f74140b3459b20683e
| * Fix typov5.3.0-beta1Sergio Ahumada2014-03-041-1/+1
| | | | | | | | | | Change-Id: I443e6f97335259c3cea69c296d0b2efe5017ba65 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Id4712d59cf5ee42b5a04a72f712dc71addd49472 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1Frederik Gladhorn2014-01-170-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id379003446bebe11e3d3fe7864d7b48e65bf1890
| * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I74b5788f07acf837bb4d81162732644e40f42175 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-2/+2
|\ \ | |/ | | | | Change-Id: Ife43dad6efd6fdb78e030b14a276ba70488312bd
| * Merge remote-tracking branch 'origin/release' into stablev5.2.1Frederik Gladhorn2013-12-031-2/+2
| |\ | | | | | | | | | Change-Id: Ie268c1b4ad0e49393015d3a1a46785bb8c17c44a
| | * Doc: Updated url variable in qdocconf files.v5.2.0Jerome Pasion2013-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: If867f487719da5cccf1b0edd91f620728885b1fd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: Fix module name used in documentation filterTopi Reinio2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebKit Examples creates a filter with name 'QtWebKit'. Change it to use the correct name so that Qt WebKit can add its own filter. Task-number: QTBUG-34966 Change-Id: Iad74a20d72eebf2e20309a54f633a24f8c1e3d12 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib1ccb9d61eee5fc4d007eb19298d4a95ee821b51
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-271-1/+1
| |/ | | | | | | | | | | | | Change-Id: Ic460fc350c446a91ef105b7fe92cda937f0ef914 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* | Bump qtwebkit-examples version to 5.3.0Thiago Macieira2013-10-141-1/+1
| | | | | | | | | | Change-Id: I77e3879dd545d99db46665537008377677f7d131 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-111-2/+2
|\ \ | |/ | | | | Change-Id: Id075e7cf92b8cfe699f81859c4b1174c045757cd
| * Doc: Fixed license header.v5.2.0-rc1v5.2.0-beta1Jerome Pasion2013-10-101-1/+1
| | | | | | | | | | | | | | Was missing the / at the beginning Change-Id: I6a0b6a1895b3085d7ae9802a4d50a2712470cbfa Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Fixed title of examples page.Jerome Pasion2013-10-101-1/+1
|/ | | | | | | -The module name is the same, so I added "List" at the end. Change-Id: Iee93d45b276450ea566d20edb20941f14d41247e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-061-0/+22
|\ | | | | | | Change-Id: Ida4930084e35478af9ceb26107434bd42c33d2a3
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-08-161-0/+22
| |\ | | | | | | | | | Change-Id: I7dfbb5305647cf87e36948345df2255c16f27596
| | * Add "dummy" changes file for 5.1.1v5.1.1Simon Hausmann2013-08-161-0/+22
| | | | | | | | | | | | | | | Change-Id: I437ad3c1c85ab0daf102921a40de83e161b5a5da Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
| | | | | | | | | | | | | | | Change-Id: I26b1c8297dab679ccfec1db98ea6efdea6850abf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I1a46f61858b79cc24cfb904a88b06c50ba93143b
| * | Remove wrong executable flag from formextractor/form.htmlDmitry Shachnev2013-08-051-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic9a0e658b0dc877215eea7f1ad8ff4456235720d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Merge branch 'stable' into devSergio Ahumada2013-08-050-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I88849dbc59587f40d8f36e54a400af00c1e7edc8
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I977f61a055455a589eab2121e99869f25181025f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-1/+1
|\ \ | |/ | | | | Change-Id: Ib0b25e1a510be39aa911b8b452a9b0067e630659
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-07-041-1/+1
| |\ | | | | | | | | | Change-Id: Iaef8f563467bbcdffb41991e1a0e3cfa85297969
| | * Only build QML examples if the QtQuick module is availablev5.1.0-rc2v5.1.0-rc1v5.1.0Andras Becsi2013-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31255 Change-Id: If0b46400416c82858bca509903ef711b9fb250ea Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-044-11/+8
|\ \ \ | |/ / | | | | | | Change-Id: I4e54de1ee5d587cefe269838a42d16a4bee54ed6
| * | Silence compiler warnings in browser example.Friedemann Kleint2013-07-034-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings.cpp(138) : warning C4189: 'jar' : local variable is initialized but not referenced settings.cpp(240) : warning C4189: 'jar' : local variable is initialized but not referenced searchlineedit.cpp: In member function 'virtual void ClearButton::paintEvent(QPaintEvent*)': searchlineedit.cpp:68:12: warning: variable 'color' set but not used [-Wunused-but-set-variable] networkaccessmanager.cpp: In member function 'void NetworkAccessManager::requestFinished(QNetworkReply*)': networkaccessmanager.cpp:115:12: warning: unused variable 'pctCached' [-Wunused-variable] networkaccessmanager.cpp:116:12: warning: unused variable 'pctPipelined' [-Wunused-variable] networkaccessmanager.cpp:117:12: warning: unused variable 'pctSecure' [-Wunused-variable] networkaccessmanager.cpp:118:12: warning: unused variable 'pctDownloadBuffer' [-Wunused-variable] history.cpp: In member function 'virtual int HistoryMenuModel::rowCount(const QModelIndex&) const': history.cpp:516:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] history.cpp: In member function 'virtual QModelIndex HistoryMenuModel::mapToSource(const QModelIndex&) const': history.cpp:541:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Change-Id: I76ba8ff28509f39c653e9b5ba707e380393dff0d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Doc: Setting navigation variables.Jerome Pasion2013-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | -using the Qt WebKit Examples as landing page. Change-Id: I6e6fdfb4f17e96062a17792bd73647f08ef19177 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-1210-49/+41
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: Iab6cfb72de2d9ad06d35d5b98e1cf8b369a29e00
| * | Fix the html output of the QObjectXmlModel example.Michael Brüning2013-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a title to the XQuery file to prevent generating an invalid self-closing title tag in the html output. Task-number: QTBUG-31525 Change-Id: Ieef162ebc9a89028b7cde81d0b42c649232488c7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-301-1/+1
| |/ | | | | | | | | Change-Id: I14367842b2eb968eb870d5f3b799a997d0665094 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I71e26192238cfd548a4f766d1fe469e390eea2a5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
View Lorry Controller Status