summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
| * Add changes-5.1.0 fileSergio Ahumada2013-05-141-0/+22
| | | | | | | | | | | | Change-Id: I90cf290d4dd630218fe8ef11f9e3e6b5d03e545e Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * QML Examples: Remove .qmlproject filesv5.1.0-beta1Kai Koehne2013-05-072-32/+0
| | | | | | | | | | | | | | | | | | The examples use qrc nowadays, so you can't launch them via qmlscene. Avoid confusion by only offering the .pro file. Change-Id: I6f9b3d1246e62172969a34840ab6c550899d2583 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Fix typo in docsKai Koehne2013-05-071-1/+1
| | | | | | | | | | Change-Id: I7cda7d37cdeec52ded3256e62e31a1e95c8b9c43 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Rename QtWebKit Examples and Demos -> QtWebKit ExamplesSergio Ahumada2013-05-032-3/+3
| | | | | | | | | | | | | | | | | | The repository has changed its name, so updating the documentation accordingly. Change-Id: I852c5a632a830c56ae7e2df576ee45af91e61e3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * adjust to module renameOswald Buddenhagen2013-04-301-0/+0
| | | | | | | | Change-Id: Ib7a57a79760cd878dcaaf31de872c756fb6b63b9
| * use qt_parts.prfOswald Buddenhagen2013-04-261-2/+3
| | | | | | | | | | | | | | this makes "configure -nomake examples" apply to this repo as well. Change-Id: I64ee4fd67b9babf533fcfcfc022e9df085ac57de Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | | | | | | Change-Id: Ia577e078637d2a3ddb606e140ad1eafe5320bc19 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-277-11/+42
|\ \ | |/ | | | | Change-Id: Id8cd85fdcb9d640238ebd07dc59023f4569f1ef8
| * Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I61ad349fc3ebd49fba3bc3b5ddc12df2e42ac8c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix the build of the QML examples if C++11 is enabledAndras Becsi2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The build fails with the following error message: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Add spaces around the define so that it is not interpreted as an operator expression. Change-Id: I0bdb10ab844441c280a1bd6ffaf75e0e2604f9da Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * The QT_NO_PRINTER guard is too generic if QPrintDialog is disabledAndras Becsi2013-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | Use QT_NO_PRINTDIALOG and QT_NO_PRINTPREVIEWDIALOG instead of QT_NO_PRINTER to guard QPrintDialog and QPrintPreviewDialog respectively to fix the build if printing is enabled but dialogs are not. Change-Id: I7c083c32b1ff0d2ea0793873533d184c067f01cd Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-241-3/+0
| |\
| | * Merge branch 'dev' into stableSergio Ahumada2013-03-191-3/+0
| | |\ | |_|/ |/| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I23e1f8d68c66460c83e2a42007f24aa96d4032fd
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-21/+48
|\ \ \ | | |/ | |/| | | | Change-Id: Icf1cea987daf0b5b9a69823a16416ad6a5cf4a6c
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
|\ \ \ | | | | | | | | | | | | Change-Id: I9eb2b6ff75a71d8bd0bf8514b76dba68ec1c145f
* \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-052-31/+2
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I97a3851c17a6aa854679f9244684feeb2ef49a79
* | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ia56e3e51a64ed5febf9330b6996e2223e7117ebb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17239-261/+1808
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ib872687957e2de85267a0415209a58a733c41c24
* | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: If62f887a8e561832d6cf5208599221ece7760c02 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | | | | * Namespace jQuery to avoid potentional conflictsJonathan Liu2013-03-241-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fancy browser example loads jQuery but web pages may already load their own jQuery which may conflict. Task-number: QTBUG-28959 Change-Id: I6868764012f36d72362010d3e0a77ba0320f24ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | | | | * Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-224-1/+31
| | | | | |\ | | | | |/ / | | | | | | | | | | | | Change-Id: I6cfd392417a05f3e4877e29c1843a4ff004923aa
| | | | | * build with -no-widgetsv5.0.2Oswald Buddenhagen2013-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd2ef43fbecc26b39fddecba4927acd6585acf79 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | | | * disable the module when webkit is missingOswald Buddenhagen2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit may exclude itself from compilation. Change-Id: Icd15ddf1025bf8a29221c1d3f9a14ae190dbe5d8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | | | | * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7105fd60f24785744b2c0ad0970541cc501afeae Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: Ib5dd58a76e866781aef29976409a6c003d30c3dc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-2112-27/+54
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | Change-Id: I7860ca6ccaafa79ca192847ae82b3c2167b53aa0
| | | | * | Package resources for webkit qml examples in resource files.Michael Brüning2013-02-1911-21/+48
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds qrc files for the two webkit qml examples and a shared one to package shared resources. Depends on the fix for https://bugs.webkit.org/show_bug.cgi?id=107031 being merged to the Qt WebKit module. Task-number: QTWEBKIT-388 Change-Id: If02b6cfe72acd9b3d2a09b525b035646d1538dc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| | | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I15a2d228996bc87e4a25436715c0cefabbb15faf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
| | |\ \ | |/ / / | | | _ | | | Change-Id: I0ff240135fb13ed08f99eb1d2a7641210875feb4
| | * Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-211-30/+1
| | | | | | | | | | | | | | | Change-Id: Ic78f330965f400ce0f52008f56ed08999d33e9a8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: If229efadb30d97462e08f22c8f4a3dc0684f3685 Reviewed-by: hjk <qthjk@ovi.com>
| | * Merge branch 'stable' into releaseSergio Ahumada2013-01-09128-130/+184
| | |\ | | |/ | |/| | | | Change-Id: I6c60690cd3e19afc20b31de9f89da84f5535fbb0
View Lorry Controller Status