| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
| |
Make it more touchscreen friendly
Use QML coding conventions
Task-number: QTBUG-9361
|
|\
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9366
Reviewed-by: Martin Jones
|
|/
|
|
|
| |
the capability CAP_GENERAL_DLL is apparently an alias, so replace it with the
extended version
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9364
Reviewed-by: jbarron
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.cpp
src/declarative/qml/qdeclarativecompiler.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits)
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
10n: Update German translation for 4.7.0
Redesigned filter widgets
Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
Add Japanese/Korean keyboard specific keys to QKeySequence
Fixed qmdiarea autotest regression on Cocoa
Fix JSC export macros
Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
Incorrect translation for Application menu items in Mac.
doc: Fixed use of Qt 3 support function in QIcon doc snippet
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
...
|
| | | | |
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The implicit import of types in the same directory/module now imports
version -1 (which means all versions). This fixes the Twitter demo.
Additionally, the current directory is not added to the imports path.
No functionality is lost, as you can import local modules with relative
paths for the same effect.
Improved docs are on the way.
Reviewed-by: mae
|
| | | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-8713
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| | |
It is faster and easier to use to just support a single context object.
|
| |
| |
| |
| | |
Task-number: QT-2846
|
|/
|
|
| |
This commit removes the obsolete QML_REGISTER_TYPE macros.
|
|
|
|
| |
Simply copy the demo directories, instead of writing a stub .pro file.
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/main.cpp
demos/declarative/minehunt/minehunt.qml
|
| |
| |
| |
| |
| | |
Game works again, and the issue with X11 native rendering being
abysmally slow has been 'fixed'.
|
| |
| |
| |
| |
| |
| | |
It still isn't working though. Investigations continue.
Task-number: QTBUG-8549
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Where you would have written
x: NumberAnimation {}
y: Behavior {}
you now must write
NumberAnimation on x {}
Behavior on y {}
This change also makes the parser more strict with respect to multiple
assignments to a single property - they're no longer allowed. For example
this
x: 10
x: 11
is now an error.
|
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | |
|
| |
| |
| |
| | |
Task-number: QT-2538
|
|/
|
|
| |
Task-number: QT-2798
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \ |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
has proven to be confusing in practice.
property/target and properties/targets will be functionally equivilant
(the only distinction being singular/plural). In a transition these
properties can be used for both 'matching' and explicit animation
based on whether a 'to' value is supplied.
The documentation, tests, examples and demos have been updated as well.
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| |
| |
| | |
QML_DEFINE_TYPE etc. now define just the initial support version, with
support in all future versions being thus implied.
QTBUG-5421
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
API changes:
Removed bool streamIn
Added int emissionRate
Added int emissionVariance
Added void burst(count, emissionRate=-1)
While rewriting the internals to accomodate this, all other outstanding
particles bugs were believed fixed.
Task-number: QT-2392 QT-2391 QT-2390 QT-2406
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/debugger/qmldebug.cpp
src/declarative/fx/qmlgraphicsimagebase_p.h
src/declarative/util/qmlanimation.h
src/declarative/util/qmlstate.h
src/declarative/util/qmltimer.cpp
|
| | |
|
|/ |
|
|\
| |
| |
| | |
into kinetic-declarativeui
|
| | |
|
|/ |
|
| |
|
| |
|