aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/demos/photoviewer
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-152-24/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/demos/photoviewer/deployment.pri One side made it redundant; the other removed part of it; remove it all ! src/quick/scenegraph/util/qsgatlastexture.cpp One side changed a preprocessor condition, the other a code condition, on adjacent lines; keep both changes. tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp One side changed a condition, the other the content of its block; keep both. Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986
| * demos: Fix installation of photoviewer example and add to buildRobin Burchell2016-07-052-28/+2
| | | | | | | | | | | | | | | | deployment.pri seems suspicious (and qmake errors about it actually), so just use the example install path and trust that it will be okay. Change-Id: Id3b6abd80f84485e006473130873ab89ee11c0d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-083-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-243-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: If3baf60fb7c0045446ddfddecef96374845e739e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-011-5/+1
| | | | | | | | | | | | Change-Id: Ie734d6bfcb492c8aeeb18909650a27b1288f2b52 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Updated license headersJani Heikkinen2016-01-2010-168/+338
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I09ba19590e9425d5116a6c27cbc183debb485dde Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-3/+3
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf LICENSE.GPLv2 examples/qml/networkaccessmanagerfactory/view.qml src/qml/jsruntime/qv4runtime.cpp src/qml/jsruntime/qv4stringobject.cpp Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
| * Doc: link issues qtdeclarativeNico Vertriest2015-02-041-3/+3
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Update copyright headersJani Heikkinen2015-02-1211-76/+76
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Revert: use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-281-2/+1
| | | | | | | | | | | | | | | | | | | This reverts commit 427646b8d7c52e5b84240e07ffd391217ce3bfa8. It seems that it should have been more correct, but we are still not shipping English translations, and static QString find_translation() in qtranslator.cpp will return any language which is in QLocale::uiLanguages() for which the translation file is found. That is a long list on OSX. Reverting the patch means find_translation() is not called in such cases. This change can be re-done whenever we are more sure that the attempt to find a translation will succeed in finding a sensible one, or fall back to not translating, rather than choosing a language that the user didn't intend. Task-number: QTBUG-41977 Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-011-1/+2
| | | | | | | | | | | | | | As the docs explain, the variant of QTranslator::load() taking a const QLocale& is better because it "uses QLocale::uiLanguages() and not simply the locale name, which refers to the formatting of dates and numbers and not necessarily the UI language." And, using a default-constructed QLocale permits QLocale::setDefault() to override the system locale, so for example an application's main.cpp can do that before constructing a QQmlApplicationEngine. Task-number: QTBUG-7329 Change-Id: Ia29a4c894087c92b071c0fe484728866f2660fe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Doc: add documentation for Photo Viewer exampleLeena Miettinen2014-09-191-3/+288
| | | | | Change-Id: Iffedd9361bd0475a53c1a8b9567c9cbf5e5d4867 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-2510-188/+108
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Photoviewer: Allow using the Android back button to go back.Niels Weber2014-05-271-1/+17
| | | | | | | | | Don't show back button on Android, as the system back button can now be used. Task-number: QTBUG-38122 Change-Id: Ia3a677f4626eaf34e23dfcc7997e4b850d8b7020 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Make a pro file based project out of the photoviewer exampleNiels Weber2014-05-2112-67/+175
| | | | | | | | | | | | Having a .pro file project is necessary to be able to deploy to Android. Further patches for Android support will be needed, but this is the base. Task-number: QTBUG-38122 Change-Id: I878ec1df50d7375ae9153f8a34f763b5678d7774 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Doc: Improved Qt Quick Demos documentationJerome Pasion2014-04-161-3/+9
| | | | | | | | | | | | | -added include from qtbase/doc/global about running the example. -added link to "QML Applications" (main landing page for QML) -highlighted the names with \e -various documentation changes Task-number: QTBUG-33597 Change-Id: I9e23b8b61862c424f2a17003b3d1f5b2ef931ceb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Make Qt Quick demos accessible from Qt documentationSze Howe Koh2013-05-072-0/+35
| | | | | | | | | | | Add screenshots and brief descriptions. Integrate source code into documentation. Create new group, "qtquickdemos". Change-Id: I92715b2cdd861b1ff2bdd28a640e63d2a220499e Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add QtQml.Models moduleAlan Alpert2013-03-122-2/+4
| | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-109-9/+9
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-1018-0/+973
follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 15:40:25 +0000