summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable compilation of framebufferobject example for OpenGL ES 2.0v5.1.0-rc2v5.1.0-rc1v5.1.0Gunnar Sletta2013-05-282-1/+3
| | | | | | | Task-number: QTBUG-31345 Change-Id: Ic2659fa90c3928ed75d5768dfb386184b523c8cd Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | 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: I6b6d5efa72d00be636668c393418990a5da45a1b Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | Change-Id: Ifbfa3c376b398d608c9a73fb5ebd9a0951ee0c5d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix bic autotestv5.1.0-beta1Jan Arve Saether2013-04-291-28/+3
| | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: If2b9795809aa0a6a7278eaaea25239ffb40db7b8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix qsqvgfunctions_wince_p.h include in order make build pass for WEC7.Janne Anttila2013-04-241-1/+1
| | | | | | | | | Apparently the included header name was not renamed when the following patch: https://codereview.qt-project.org/23497 evolved and header filename was changed. Change-Id: Id4ff055046c46b630c2014bc1ba60f36c8520337 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add license files mandated by (L)GPL.Timo Jyrinki2013-04-104-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I827ef3c1bcb58b5aa7afbfd985f47a14fbe6ecc9 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+25
|\ | | | | | | Change-Id: I3e4b4a41d1d55a2e78ee560c68d6e7cdcc35a6b9
| * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | Change-Id: Ie459a12aa8b8b2ca8ee72a78d3e30ed05b4f72cb Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I3d7cc94abbf06561823d1ec350712e970f5c7186 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-1910-227/+18
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ib22f7e4aad77af52f9d9a57a87b5e6d039c7e18b
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-143-2/+4
| |\ \ | | | | | | | | | | | | Change-Id: I72bdbfcf34983d76ce9fa2d4c1e1304324615107
| * | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-131-201/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2666b04d34ba209ed92984bc2b1a9b30a4fa4b3d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | | Doc: Removed reference to non-existing .qdocconfJerome Pasion2013-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt-modules-default already includes the necessary config. Change-Id: Ib957e57f6ebcb0d55f2fa1f87ec17efdc0516298 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1838-829/+44
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I9b3bad61dde9a1e21a3501c204b8afc664a04556
| * | | | Fix syncqt warning about qsvgfunctions_wince.h.Friedemann Kleint2013-02-013-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it a real private header. Change-Id: Ic3012a1791f804312d464de0d28b9fc9d641925a Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-285-20/+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: Ide31e202399c7cce09bd06e7181361f62dda658c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17271-19352/+17386
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
| * | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I3911d7fdb41edce772eaebf0e6ed1e2a81515509 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | | Make the QtSvg cmake module test independent of QtWidgets.Stephen Kelly2013-03-141-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28bd2d1ff6ac095701a88ffffdc9478c6fbb0585 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I23025512514720b93651b8aee8acd0036d69ba1a
| * | | | define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: If2aa30a217e8042f8571b93f42d826ddad41d9bd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20121-916/+17267
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I9fa700f17504e7b0e8544d8095e753641bb44a7d
* | | | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I362c58cd27341932a7e8ad5e0bb96375249a3ea9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ied86966abb0bb09cca314cdd099e2b93b5f82c05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | fix doc page urlsOswald Buddenhagen2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | they are versioned nowadays Change-Id: I0ceda017e0d3124cc28b97f190582dc3cc533304 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-051-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb6e0dd150c93f9ddaaa501ed73245c6ba3b223f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | purge useless doc/global dirOswald Buddenhagen2013-02-053-751/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | these files are part of the default qdoc settings already. Change-Id: Ifd420559b2bff42cb67b2f5d0909e8036bdb7e95 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I8824856bf88d79c94971e621e04d00b8aa502e14
| * | | Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-231-30/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I03d2b06526e207848dee31b9ae2dcc0c0f179972 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | | doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6e5de4551e056b404191688c6913053c9844339 Reviewed-by: hjk <qthjk@ovi.com>
| * | | Merge branch 'stable' into releaseSergio Ahumada2013-01-0911-24/+73
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6ae8209211f9a294681ea04dff070543957d1053
| * | | | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I981bc4971bbf67456a3ad86b038030f43c5653ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | Fix module name format in file headersSze Howe Koh2013-01-2928-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: I418bbd3817d433a1b82f0f0fea68f2235d2abc5a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | | | Doc: Fix module name formatSze Howe Koh2013-01-268-9/+9
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: Iec74520d922bf87241eca8e12698ed3fbff84367 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | tst_bic: Add linux-gcc-ia32 bic data for QtSvgSergio Ahumada2013-01-151-0/+17114
| | | | | | | | | | | | | | | | | | | | Change-Id: If4b1dc9a7e401b726dd0b2459b730e1c3449d29b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | | remove QT+=widgets from SUBDIRS projectsOswald Buddenhagen2013-01-116-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it makes no sense whatsoever Change-Id: I02383afae25b2c29ad784d59025238f84375765e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | make use of qtHaveModule()Oswald Buddenhagen2013-01-1111-12/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Idd8bca1e8e9bb183bc6725b9a9d6a220d609869d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10103-103/+103
| |/ / |/| | | | | | | | | | | | | | Change-Id: Icf9d15a0f1f38ab60f0dd8fc2bc6ac936dd7dc62 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Fix a bad virtual overrideThiago Macieira2013-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Problem found by Clang. It took me a while to notice the missing "s" qsvggenerator.cpp:177:10: error: 'QSvgPaintEngine::drawImage' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Change-Id: If95e299f12dea62344efee4a2c542b6474314b0e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | clean up example project files wrt QT+=widgetsOswald Buddenhagen2013-01-045-12/+5
| | | | | | | | | | | | | | | Change-Id: Ie39fa6ef364320842e8efe30594f9cfad39fce26 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I6bb5fbbb684809d457ea604bcf6c65dd20c60c43 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
| | | | | | | | | | | | | | | Change-Id: If9d7570e83aea83399f306f4a21ea0e2c2ec0eab Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: Ib54f853ace28927e434e4d7b9e3549cfa28163d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fix crash when running in a QGuiApplicationAlbert Astals Cid2012-12-202-6/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | A QGuiApplication has no style so crashes on a null pointer or asserts in qtbase Changed test to not depend on widgets so we get a QGuiApplication instead of a QApplication Change-Id: Ib4dcc8f8679d3e6b8c11f7ccd5b2539c9de0803b Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: David Faure (KDE) <faure@kde.org>
* | make qtbase build dir dependency explicitv5.0.0Oswald Buddenhagen2012-12-131-3/+5
| | | | | | | | | | Change-Id: If18427d317328607615d6a06878930dd2d124ecd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Capitalize "Qt SVG" properlySze Howe Koh2012-12-135-12/+12
| | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: I9a7a30f45a56f8700498cb382899e2139689b998 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Entered hardcoded url for SVG 1.2 TinyNico Vertriest2012-12-131-1/+1
| | | | | | | | | | | | | | | | Corrected in svgrendering.qdoc Task-number: QTBUG-27512 Change-Id: Iae880281be82a8ac8ac20b717676750a4cd84f69 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | make use of qt_headersclean.prfv5.0.0-rc2Oswald Buddenhagen2012-12-112-66/+2
| | | | | | | | | | Change-Id: I09f4401d4265a7aa3127a90830f9c2cc190869e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add PLUGIN_CLASS_NAME to qtsvg pluginsMiikka Heikkinen2012-12-102-0/+2
| | | | | | | | | | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Icfcc07e659c7d07342a7892923d485b54321eae1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Use the bundled zlib in QtCore, if present.Debao Zhang2012-12-1046-19011/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | src/3rdparty/zip is used for windows to build QtSvg under normal builds. See sha: 6cdba02f6c4fc8c6baab7e03e0a2bedcb9a2d334 But QtCore has provided the bundled zlib headers for external access and exported its public symbols when Qt is configured under normal builds on windows So there is no need to keep a seperate 3rdparty/zip copy any more. Change-Id: Idf9cbce4c28a929f6dc6f7b25e22b28c1165fb55 Reviewed-by: aavit <eirik.aavitsland@digia.com>
View Lorry Controller Status