| 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
- 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: Oswald Buddenhagen
|
|
|
|
| |
Rubberstamped-by: Oswald Buddenhagen
|
|
|
|
| |
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
| |
- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)
Reviewed-by: Casper van Donderen
|
|
|
|
|
|
|
|
|
|
|
|
| |
touchintegration/ gestures, mousearea and pincharea example
modifications
Modified examples 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>
|
| |
|
| |
|
| |
|
|
|
|
|
| |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| |
| |
| |
| | |
Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
|
|/
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|
|
|
|
|
|
|
|
| |
The maths was dodgy - producing far greater scaling than that provided
by PinchArea.
Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5
Task-number: QTBUG-17828
Reviewed-by: Michael Brasser
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15491
Reviewed-by: Michael Brasser
|
| | |
|
|/
|
|
| |
Task-number: QTBUG-15491
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|
subdirectories to make it easier to locate examples for certain
features (e.g. animation) and to distinguish between different types
of examples (e.g. very basic examples vs complex demo-like examples).
|