| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
The example needs no_batch in CONFIG because examples/script/customclass
and examples/script/qscript contain a main.cpp and nmake's inference
rules get confused which one to choose.
See QTBUG-13496 for details.
Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a
(cherry picked from commit qtscript/6bc42fb243edf5870c82cca6c53824a588007faf)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
| |
This example is needed by tst_GuiAppLauncher::run()
Change-Id: I4ad828006bb0b801eefc374950f1345fdf2b0f8b
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
| |
Add missing files and update qml file
Change-Id: Ic9c2279b665d06a33e4f0f9484cf9a0ff648bc23
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
| |
Change-Id: Ibc9cdd89503fc085ed0441ff34cbe2f729e67066
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
A example has errors about TypeError
Change-Id: Ie6e9c769e83c5a3410c1131383c50dfedb828c41
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Gesture examples were always enabled regardless the used
Qt configuration. Added check for QT_NO_GESTURES to examples.pro,
and included gestures examples only when needed.
Change-Id: Ic8789aedb1251a3827191c647d4b0c4d5a1b6306
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-23874
cherry-picked from qtbase c8156cab81690526adffa22214657fc1c6563b8b
Change-Id: I371a3eb3f4145d80e9f51fe89d61bac5c269d587
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
Manually update strings that did not get fixed by previous
search-and-replace.
Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix declarative examples and demos issue on Windows
|
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows, if the resulting binaries reside in /Delease
and /Debug subdirs. Thus we require the same hack as on
Meego where the binary alone resides in the /bin subdir.
Reviewed-by: Alessandro Portale
|
| |
| |
| |
| |
| |
| |
| |
| | |
The attempt to turn them into C++ examples messed them up as QML
examples. Have QtDemo treat them as C++ examples for now.
Task-Number: QTBUG-22983
Reviewed-By: Chris Adams
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-22937
Reviewed-by: Chris Adams
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
|\ \ |
|
| | | |
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Remove dependencies from examples
- Remove stray copies of qtc_packaging
- remove .desktop files
- rename examples (to their old name)
Reviewed-By: Casper van Donderen
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-By; Casper van Donderen
|
| |
| |
| |
| | |
Reviewed-By: Oswald Buddenhagen
|
| |
| |
| |
| | |
Rubberstamped-by: Oswald Buddenhagen
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Oswald Buddenhagen
|
|/ /
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| | |
The license had too many comments in them, these are now removed
Reviewed-By: Trust me
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
| |
| |
| |
| |
| |
| |
| | |
- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)
Reviewed-by: Casper van Donderen
|
| |
| |
| |
| |
| |
| |
| | |
The qml files were moved within the examples, the qrc files were not
updated accordingly. This change fixes the problem.
Reviewed-By: Daniel Molkentin
|
| |
| |
| |
| |
| |
| |
| |
| | |
The previous version of the template did not work on Harmattan, It
caused the application executable to look in the $HOME directory,
instead of the application directory.
Reviewed-By: Daniel Molkentin
|
| |
| |
| |
| |
| |
| |
| | |
Cleaned qgraphicsgridlayout.pro and qgraphicslinearlayout.pro files.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|