summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-18Bump package version to 5.4.0tizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_wearable/20150127.000002submit/tizen_tv/20150323.000000submit/tizen_tv/20150320.000000submit/tizen_mobile/20150128.000000submit/tizen_ivi/20160217.000007submit/tizen_ivi/20160217.000000submit/tizen_ivi/20150120.333333submit/tizen_ivi/20150120.111111submit/tizen_ivi/20150116.333333submit/tizen_common/20150107.105300submit/tizen_3.0_ivi/20150120.222222accepted/tizen/wearable/20150129.005541accepted/tizen/tv/20150324.014644accepted/tizen/mobile/20150129.040539accepted/tizen/ivi/20160218.025822accepted/tizen/ivi/20150120.050817accepted/tizen/common/20150112.104331accepted/tizen/3.0/ivi/20150120.102904tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commonTomasz Olszak1-1/+1
Change-Id: If091da50bc74af538c6dd8cecb86fddb14003660 Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Updated to Qt 5.3.99+beta1Tomasz Olszak1-1/+1
Change-Id: I8a0d36d4c8ac54aaed2e1d200e8dfa884c4b5035 Bug-Tizen: TC-1008 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Added .gbs.conf file to follow upstream tags formatTomasz Olszak1-0/+2
Change-Id: I7f25596d0e67f7d48f2208671af9292f89230e8f Bug-Tizen: TC-1008 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Changed source package name in prep step to allow incremental builds.Tomasz Olszak1-2/+2
Change-Id: I17b24ebe85f88cbb3b0ac5732b2a9b704344eb19 Bug-Tizen: TC-1008 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.3.1Tomasz Olszak1-1/+1
Change-Id: I8dd43e006df48d2aca0f93edd8db1e8cd1af2eff Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.3.0Tomasz Olszak1-1/+1
Change-Id: Icf680c045e61d3fb0ecc00486dc2389d74b1401c Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.2.96+rc2Tomasz Olszak1-1/+1
Change-Id: I18f6f9e29cf95f55f8ff0113ab83084e476bde7a Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.2.95+rc1Tomasz Olszak1-1/+1
Change-Id: I9eb333b6c824a260a9f2e86aaaabb53c36c97a37 Bug-Tizen:TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Added manifest file according to smack 3-domain model.Tomasz Olszak2-1/+9
Bug-Tizen:TIVI-2416 Change-Id: I1a07d1661af21475f1db45e172d0c10df7288bd9 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.2.90+alphaTomasz Olszak1-1/+1
Bug-Tizen:TIVI-2416 Change-Id: Ie7134b79efd2a1c22e135f4e92b686dd5437dea1 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.2.2Tomasz Olszak1-1/+1
Tizen-Bug: TIVI-2416 Change-Id: I07e28c8cb8b3dac7578ee9c6e2e6fea480ca53b0 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-12-17Bump package version to 5.2.1Tomasz Olszak1-1/+1
Change-Id: Ia9fb8a0fa5255f00a1d870db1793fe276025c274
2014-12-17spec adapted for TizenTomasz Olszak2-64/+80
2014-12-17Import from MerTomasz Olszak1-0/+64
2014-10-10Doc: Applied title case in section1 titlesv5.4.0Nico Vertriest1-1/+1
Task-number: QTBUG-41250 Change-Id: Ic91b1db2bd27800a808cd4c997c1b606ea4bec10 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-10-10Correct grammar in DropShadow's detailed description.Mitch Curtis1-2/+2
Change-Id: If77e25a80ed139c0903b511062ff6dd615df2c70 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-30Document DropShadow and Glow's transparentBorder properties.v5.3.99+beta1Mitch Curtis6-0/+207
Change-Id: I1f4be68c5b364e5d2151ed26b079a0f00ac31f0c Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-09-21Adding designersupported to pluginsThomas Hartmann1-0/+1
This patch adds designersupported to the plugins supported by QtQuick Designer. Change-Id: I022bdeab6ef1e22dfffd7e1e95b292212aaf10eb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-16Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I7fd0ea8631fc0f5e9228781afe66b3dda9d73f59
2014-08-29Bump versionFrederik Gladhorn1-1/+1
Change-Id: I0668ef08ef66d837de74816b805b634e0c0d50e8
2014-08-24Update license headers and add new licensesJani Heikkinen15-893/+596
- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I452f44a464e8da80ee4c0c38de6ec6abfd6ac285 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
2014-07-07Doc: Removing url variable from qdocconf file.Jerome Pasion1-1/+0
-url inherited from the url variable set in qtbase/doc/global Change-Id: I8491c5c29e7278eb50d27062e3cdcaf0bfccaac0 Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-06-26Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I29cb249c95dfed1e8d3f356d52bfe7c73c13c786
2014-06-18Bump versionOswald Buddenhagen1-1/+1
Change-Id: Ia99459e3fda29a937feac06b63610394fda43684
2014-06-11Doc: Fix qmlclass selector used in documentation configTopi Reinio1-1/+1
A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: I0444e3860b15458b782982b5382469056022637c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-05-09Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I5a75f8070bf8e0c4fb52ee8eabecba2fa75b5f1f
2014-04-22Bump MODULE_VERSION to 5.3.1upstream/5.3.1upstream/5.3.0upstream/5.2.96+rc2upstream/5.2.95+rc1Sergio Ahumada1-1/+1
Change-Id: Ic647a5bb39de64d02fb5d98cbda8c7f398ce8f1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-20Bump module version to 5.4.0Thiago Macieira1-1/+1
Change-Id: Ibe73377ed23dab372340712ca64b40b176dcc249 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-10Merge remote-tracking branch 'origin/stable' into devupstream/5.2.90+alphaSergio Ahumada1-1/+1
Change-Id: I82b917891d9d835ccf62b0765a43936cfc50611b
2014-02-06tst_qtgraphicaleffects: make the test work on devicesupstream/5.2.2Sergio Ahumada1-1/+1
Make the test find the 'QtGraphicalEffects' import under Qml2ImportsPath (QML 2.x) instead of ImportsPath (QML 1.x) when the source code is not available. This seems to have worked so far because the source code is always available in the CI machines, but it fails on devices where is not. Change-Id: I475ccd5431d5e7c3adf239b1158d7bb67e0bc042 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
2014-01-17Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-1/+1
Conflicts: .qmake.conf Change-Id: I81e166011a25fca9f883937fa9ebf7fbee09e9b9
2014-01-16Bump MODULE_VERSION to 5.2.2Sergio Ahumada1-1/+1
Change-Id: Idabb42fbb74c0398aa821c0592fbaa5afa92afd6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-15qdocconf: Remove nonexistent dependencySze Howe Koh1-1/+1
Change-Id: I7db363247c460d5a250fc59a1347d8c56b19c4b4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-11-29Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I194516b948b437c85f0c6f93a1b0b339a4a76bb9
2013-11-25Bump MODULE_VERSION to 5.2.1upstream/5.2.1Sergio Ahumada1-1/+1
Change-Id: I59276a6546747fb7e5e73fba25f199936884a828 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-20Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-5/+4
Change-Id: Id90bd6d65f15785215cdac2c19bae937925afbd3
2013-11-14Avoid out-of-bounds accessGunnar Sletta1-5/+4
Task-number: QTBUG-33364 Change-Id: I33d713df5d60a349c48f109a5f76db5fa57573af Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2013-11-08Merge remote-tracking branch 'origin/stable' into devSergio Ahumada25-1/+81
Change-Id: Iba1fab2097ca750924b169017e2c7d2825b066c6
2013-11-07Document recursion limitations of the graphical effects.Gunnar Sletta24-0/+80
Task-number: QTBUG-31902 Change-Id: Id9d81ffddda3ee666840f602bb8c85ff00545547 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-11-06Doc: Updated url variable in qdocconf files.Jerome Pasion1-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: I10272de25b7cc686b0f08a3d0460b5b91e7aa43f Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-09-25Bump qtgraphicaleffects version to 5.3.0Sergio Ahumada1-1/+1
Change-Id: Ib446e07e6f78af935a923cbd06383ceafe4335ef Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-13Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann1-1/+0
Change-Id: I3739b28c055ff43099c5a3cb0a1061fd90aa66de Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-05Merge branch 'stable' into devSergio Ahumada2-3/+30
Conflicts: .qmake.conf Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
2013-07-26Merge remote-tracking branch 'origin/release' into stableSergio Ahumada1-0/+25
Change-Id: I663dcb98573fa55d69b73f3740aa54772c55ff14
2013-07-26Fix compilation of pngdumper.Friedemann Kleint1-3/+5
Change-Id: I15c281d6ddfe9dafa6b4411a47b341be35dbf98d Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-07-24Bump MODULE_VERSION to 5.1.2Sergio Ahumada1-1/+1
Change-Id: Ifac7344b43c99a2f31f4a217ef537931092f7dd8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-23Add changes-5.1.1 fileSergio Ahumada1-0/+25
Change-Id: I619cadbd90dcc71b7f3b1f56acb86629fd7bd1b2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-23Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2-2/+2
Change-Id: I90a1f360da098f92db19685a2d6b4caddf6f35e8
2013-07-19Fix domain in pngdumper.Friedemann Kleint2-2/+2
Task-number: QTBUG-32390 Change-Id: Ia511663070b75fae7a2bef1ef16c12ac415facc6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-11Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+2
Change-Id: If1557686dd6626724246f700e78f77f4ed7d6d0c