| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qml.h
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
src/multimedia/playback/qmediaplayer.cpp
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | | | |
|
| | |/
| |/|
| | |
| | |
| | | |
QmlBinding exposes way too many implementation details to be confident
about making it public right now.
|
|/ /
| |
| |
| | |
Task-number: QT-2798
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
Fix copyright year.
Fix broken license headers.
doc: Fixed some qdoc errors.
Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
doc: Fixed some qdoc errors.
QNetworkAccessManager: add method to send custom requests
doc: Fixed some qdoc errors.
Optimization: Avoid calling out to public API function
Mac: submenu shows up at the wrong position
Add operator< and qHash for QSharedPointer and fix operator-.
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
...
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
| |
Add to translations profile. move stuff out of QObject-context,
correct spelling and contractions, correct usage of tr().
|
| |
|
|
|
|
|
|
| |
This should allow QGuard to be removed from Qt and QObjectPrivate::ExtraData.
Having QmlGuard inside QmlDeclarativeData reduces the number of new's, and
creating QmlDeclarativeData is faster than QObjectPrivate::ExtraData anyway.
|
|
|
|
|
|
| |
make use of QVariant::userType over Qvariant::type
make use of char for 1-string character
QCoreApplication::translate is static
|
|
|
|
|
|
|
|
|
|
|
|
| |
- include headers from own directory with ""
- include headers from own project without private/
- sort includes from most specific to most generic
- make headers self-contained
- some whitespace unification
no attempt was made at making the qt includes consistent regarding the
use of module names and forwarding headers.
no attempt was made at sorting includes.
|
|
|
|
| |
It seems we're going to have to so a syncqt/configure in Qt modules.
|
|
|
|
| |
May help modularization (syncqt and configure are Qt-specific).
|
| |
|
| |
|
|
|
|
| |
Task-number: QTBUG-5769
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/
|
|
| |
as it breaks reinstalling the module against existing Qt.
|
|
|
|
| |
Fixes QTBUG-5480
|
| |
|
| |
|
|
|
|
|
|
| |
QML_DEFINE_TYPE etc. now define just the initial support version, with
support in all future versions being thus implied.
QTBUG-5421
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcomponentjs.cpp
src/declarative/qml/qmlcomponentjs_p.h
src/declarative/qml/qmlcomponentjs_p_p.h
|
| | | |
|
| |/
|/| |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
SetProperties -> PropertyChanges
RunScript -> StateChangeScript
SetAnchors -> AnchorChanges
|