summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-08Mark internal properties in FastBlur documentation.Mitch Curtis1-0/+2
Change-Id: Icebfba44bcf22e851b925f05546d46b26d4d5cae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-06-26Doc: Setting navigation variables for the navigation barJerome Pasion1-1/+4
-also adding 'qtdoc' 'qtcore' in the depends variable Change-Id: I8299e242412739ffdf5fdf2d889e2058f6877684 Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-06-04Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-4/+5
Conflicts: .qmake.conf sync.profile Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501
2013-05-29Bump MODULE_VERSION to 5.1.1Sergio Ahumada1-1/+1
Change-Id: I76871708e861efc18786f12ac1bcd6156003e875 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-26sync.profile: Point dependencies to an empty stringSergio Ahumada1-4/+5
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: I9b031859972b0996987eb4cc697b06b0fb569d89 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-05-23Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn6-0/+1704
Change-Id: I4083f690818459b5d53fa025413bfb321e12e7c6
2013-05-13Add changes-5.1.0 fileSergio Ahumada1-0/+22
Change-Id: I74ec8ea6ee06476f501720a4142ced70a41d2962 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-10Add license files mandated by (L)GPL.Timo Jyrinki4-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: Ib44292c867e2e54d85d69870f613f0390f5dca78 Reviewed-by: Jason McDonald <macadder1@gmail.com>
2013-04-03Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn1-0/+22
Change-Id: I76fa4a12697fae965069e02e860333e403b67aed
2013-03-28Update module version to 5.2.0Frederik Gladhorn1-1/+1
Change-Id: I3a2882ae0b5acdec6f92d95434bd1bd3ee5cb277 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-27Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+2
Change-Id: Ifad82383380e8a26204ebd0d5543c9a8ab338601
2013-03-25Bump MODULE_VERSION to 5.1.0Sergio Ahumada1-1/+1
Change-Id: Ia93343a4a737cbb643271108eb3b77249c948752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-20Add changes-5.0.2 fileSergio Ahumada1-0/+22
Change-Id: I60ccd6669797865dbf0337d23d214c26078bcefe Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-03-19Merge branch 'dev' into stableSergio Ahumada2-0/+2
This starts Qt 5.1 release cycle Change-Id: I7a2f8e638aadd9b3f8b65cb600b26136f1839842
2013-03-18Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen1-0/+2
Change-Id: I548e33c0d8c7b1c707d5be6ee2395bb313219e6f
2013-02-27define MODULE_VERSIONOswald Buddenhagen1-0/+2
Task-number: QTBUG-29838 Change-Id: I5a22a7a580f6e2740eb8510c8eb684475fafb72d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-02-21Merge branch 'stable' into releaseJohanna Aijala122-876/+125
Change-Id: Icb76f5934f37e90c0aec1524f5fe0b23add59c15
2013-02-18Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-6/+6
Change-Id: I7fab4ce7041dc8b7dc93d09d2c026be23975d58d
2013-02-06fix doc page urlsOswald Buddenhagen1-1/+1
they are versioned nowadays Change-Id: I3293f6891b7da657a440b6ac595288e54ecf23e9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-06substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen1-5/+5
Change-Id: If7c1440def877d26e93a7f44f51a51a625701c46 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-06Propegate "transparentBorder" to the correct ShaderEffectSourceGunnar Sletta2-0/+2
The SourceProxy in the internal GaussianGlow class propegated the sourceRect, but at that point it was already too late as the source is already wrapped in another SourceProxy (as a ShaderEffectSource) which only had the default sourceRectangle. Task-number: QTBUG-29259 Change-Id: Iaf5ee44a2ef0d962e254fd52fc021aecd757221d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-02-05Merge remote-tracking branch 'origin/stable' into devGunnar Sletta6-784/+4
Change-Id: I550ba62203b0a5c4020181330185e77781dc76af
2013-01-31Merge branch 'release' into stableSergio Ahumada2-32/+3
Change-Id: I925f12d3a45bfaef51387b194da9d48605ee346d
2013-01-30purge useless doc/global dirOswald Buddenhagen3-751/+0
these files are part of the default qdoc settings already. Change-Id: I68f90cfbca2c90df07ad67b9f81338d47f02714f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28Doc: Add QML Types to table of contents in AssistantJerome Pasion1-1/+1
Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: Ibdea992292e379c3759105685dcd19a3a809e475 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-26SourceProxy.qml: removing binding 'output: input'Thomas Senyk1-1/+1
The binding is redundant as onInputChanged will always trigger setting output Also the binding does generate binding-loop errors Change-Id: Iaa1df71a633f4bbd0554d81bb807db59a02974ee Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-22Doc: Fixed "QML Type" node in Assistant.Jerome Pasion1-1/+1
Removed "class" from the qdocconf "selectors" variable. Task-number: QTBUG-29242 Change-Id: I4d62e85c23ff0b0bd72e7fb3907bc5aa3f14efe3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-17Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn121-126/+175
Conflicts: sync.profile Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995
2013-01-16Update changes file for 5.0.1 releaseSergio Ahumada1-30/+1
Change-Id: Ibb7e5198b1101d2a9b7547768e08abcdb209737e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-12doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada1-1/+1
Change-Id: I43e7eae9e5119da24024cbabf2e17fc26334b554 Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10Update copyright year in Digia's license headersSergio Ahumada118-118/+118
Change-Id: Idaf2ac8f4dc2a8586c6e148bd67a33e9bdd677e1 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-09Merge branch 'stable' into releaseSergio Ahumada2-4/+55
Change-Id: I00358ee7fb55d5cc5537c3935a4de611c2381545
2013-01-03Add changes-5.0.1 fileSergio Ahumada1-0/+51
Task-number: QTBUG-26065 Change-Id: I57bc3a83b07a393762b644e2b55bf11a8a57b34a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-02Bump Qt version to 5.0.1Sergio Ahumada1-4/+4
Change-Id: I21883e2e71e6a720b71773f48c6b14867056b6b0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-12-18point dependencies to 'release' branchesSergio Ahumada1-4/+4
Change-Id: Ice1954729a9f5ab0ead33adbe49c277f39584729 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-16remove unnecessary CONFIG additionOswald Buddenhagen1-1/+1
qt is already added by spec_pre.prf. Change-Id: I72dc555583e5a3453050eab876f34cece8e00b47 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-13sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada1-4/+4
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: Ie5e27d7f65f6c306acb71c89b769600a46fe1150 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-12-04remove symbian vestigesOswald Buddenhagen1-3/+1
Change-Id: I7b3c4862af09fa7c0d79938c7729573173891234 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-12-04sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada1-4/+4
We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I8db5292f202bdaf11ae672f90d2ab5bc0cfe1b7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
2012-11-30Add \qmlmodule to Qt Graphical EffectsGunnar Sletta1-0/+20
Change-Id: I92ebde6a189442a2f6cc8c37d7bc3582551159fe Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-20Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt3-20/+13
Change-Id: If1ebf43ab59293eb86db2a1ffab5677c708cb93e
2012-11-16Doc: Cleaned up QDoc config file and enabled "make docs" for the moduleJerome Pasion3-19/+13
Change-Id: I7ccaccdefb92676e0f689c3d5101934fd7d574e2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2012-11-09remove pointless module pri fileOswald Buddenhagen1-16/+0
this is no c++ module Change-Id: Iff9002b5edd556a0d6f954fd6f58a1a099f4dc14 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-31test: Remove unused opengl dependencySergio Ahumada1-1/+1
Change-Id: I8c00ae2974c9697602214a0e46df98b86adbf35c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-10-29Doc: Removed the HTML template from the .qdocconf filesJerome Pasion1-1/+0
-qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I0c6e02517f0bd452d45a3729588696d183ec5dbc Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø1-0/+1
Change-Id: If531749e5b7113e693edb340ffe82f76ebe16c6b
2012-10-22Add .qmake.conf with load(qt_build_config) like other Qt modulesTor Arne Vestbø1-0/+1
Change-Id: I4d545e308702d6f99e6e92358ae40887d02c2c37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-26HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2-29/+4
Change-Id: If06ef2a81e9af6384562c605df8485980e864f08 Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-09-25Doc: Modularized documentation.Jerome Pasion351-5405/+4340
-moved API documentation in QML files -moved snippets, images, and qdoc files to src/effects/doc -deleted old .pri and .qdocconf files -fixed relative paths Change-Id: I4e757e707b5f93a215506f8c2cbb7eb1f2321d4c Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2012-09-24Change copyrights from Nokia to DigiaIikka Eklund143-1275/+1275
Change copyrights and license headers from Nokia to Digia Change-Id: I06d9e8f818910ab9243afb73087f187a4b3b05f4 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 13:31:07 +0000