summaryrefslogtreecommitdiffstats
path: root/examples/declarative/cppextensions
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1385-85/+85
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2985-510/+510
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0185-170/+170
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-303-0/+15
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1185-85/+85
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-223-3/+6
| | | | Rubberstamped-by: Oswald Buddenhagen
* Change installation location of examples.Casper van Donderen2011-11-2214-30/+30
| | | | | | The cppextensions examples were still installed to a previous location, the files had been moved within the source tree, but the .pro files were not changed accordingly.
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-213-3/+6
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* cppextensions/qgraphicslayout example correctionsartoka2011-11-172-31/+0
| | | | | | | Cleaned qgraphicsgridlayout.pro and qgraphicslinearlayout.pro files. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* cppextensions/qgraphicslayouts examples modificationsartoka2011-11-178-29/+120
| | | | | | | | Modified projects to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* cppextensions/networkaccessmanagerfactory modificationsartoka2011-11-175-24/+52
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-283-0/+3
| | | | (4.7-generated-declarative branch).
* Fixed license headers for examples in masterTimo Turunen2011-04-051-27/+26
| | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1783-83/+83
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1083-83/+83
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| | * docWarwick Allison2010-11-091-1/+1
| | |
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-082-2/+2
| |/ | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | Fix deployment for examples and testsShane Kearns2010-10-122-2/+2
|/ | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-298-8/+8
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Fixed text in license headers.David Boddie2010-09-1323-23/+23
|
* Document calling QObject methods from QML in Extending QML in C++ docs.Martin Jones2010-08-259-1/+431
|
* Fix cppextension examples.Martin Jones2010-08-1110-20/+20
| | | | | Print a useful message on error. Specify the QML url correctly.
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-2910-10/+10
| | | | QTBUG-11938 and QTBUG-10801
* Expand QDeclarativeExtensionPlugin docsBea Lam2010-07-212-1/+8
|
* improvements to docs and examplesBea Lam2010-07-141-1/+1
|
* Follow -> Behaviormae2010-07-081-8/+8
| | | | Replace the usages of Follows with Behaviors, update docs.
* Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-082-62/+39
| | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| * Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| | | | | | | | Reviewed-by: Erik Verbruggen
* | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-292-2/+2
|/ | | | | | Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me
* Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-2/+0
| | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* Fix exampleBea Lam2010-05-311-1/+1
|
* Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64
| | | | to make it clear they are custom classes/items (not built-in)
* File shouldn't be in repositoryBea Lam2010-05-311-0/+0
|
* Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
| | | | clean up qmlAttachedProperties() implementation and improve QML example
* Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3116-585/+755
| | | | qgraphicsgridlayout and clean up
* Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-315-2/+2
|
* Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* Clean up project files for c++ examplesBea Lam2010-05-243-24/+19
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2117-0/+680
|\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| * Add license headers for .qml files.Jason McDonald2010-05-2117-0/+680
| | | | | | | | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2019-123/+173
|\ \ | |/
| * Fixes for docs, example codeBea Lam2010-05-204-11/+10
| |
| * Add missing .qmlproject filesBea Lam2010-05-193-0/+48
| |
| * Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1812-19/+21
| | | | | | | | proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
* | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1958-1570/+1512
|/ | | | | Reviewed-by: Trust Me Requested-by: Legal
* Compile fixes.ck2010-05-171-0/+0
|
* Add missing .proBea Lam2010-05-171-0/+5
|