| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a graphicsobject subscribes to a gesture using the
IgnoredGesturesPropagateToParent flag, normal propagation rules do not apply to
the gesture, and instead all gestures of the given type that are started over
the item will propagate to parent items only.
Task-number: QTBUG-7400
Reviewed-by: Andreas
|
| | |
| |
| |
| |
| | |
Merge-request: 455
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | |
| |
| |
| |
| | |
Merge-request: 455
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| | |
cannot convert value correctly
Merge-request: 455
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The change introduces regression in QIntValidator and QInputDialog, which needs
to be addressed before pushing the change again.
Also reverted the following two compile fixes:
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9.
This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e.
This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6.
Reviewed-by: trustme
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This method was added to support e.g. HTTP OPTIONS (needed by Webkit);
rather than adding one method for each of those exotic verbs, there is
now a generic version for all.
Reviewed-by: Markus Goetz
Reviewed-by: Andreas Kling
Task-number: QTBUG-8206
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This allows using QSharedPointer in QHash and QMap keys.
Reviewed-by: Bradley T. Hughes
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
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
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Changed the initialization of the system locale to make construction of the
QLocale object as lightweight as possible. So now the default contructor just
creates a QLocale and QSystemLocale objects, but doesn't try to fill the cache
in the latter with data from the system and postpones it until it is actually
requested (most applications create QLocale objects on the stack and might not
even use the data from the system locale, so we don't need to initialize system
locale right away).
Reviewed-by: Thiago Macieira
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's still used by QmlDesigner, therefore the symbols have to be
exported.
Task-number: QTBUG-6845
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This better enforces the restriction on starting an animation that is
not top-level, or is part of a Transition or Behavior.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| |/ / / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Because it runs in an idle thread, which you would expect to be quite
slow under load.
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Add missing NOTIFY signals to various QML item class properties
Fix currentIndex after itemsMoved()
qmlviewer: build on symbian
Revert "Replace QList<>* support with QmlListProperty"
Declare QmlXmlListModelRole meta type before any code uses it.
Make compile on Symbian (call Q_DECLARE_METATYPE earlier)
Conditionally link webkit on wince
Revert "Run dos2unix on these files."
Expose LayoutItem documentation
Fix palette on the N900
Fix QTBUG-8090, improve original patch effectiveness.
Replace QList<>* support with QmlListProperty
Run dos2unix on these files.
Remove standalone QmlDebugger. It is now only available through the
Mobility 404
Fix crash in QmlMetaProperty that could occur when using value-type
QML binding optimizer crash
QML binding optimizer crash
Fix crash in QML binding optimizer
Don't delete binding directly
...
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Aaron Kennedy
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was accidentally pushed early.
This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qmlgraphicsitem.cpp
src/declarative/qml/qmlmetaproperty.cpp
src/declarative/qml/qmlmetatype.cpp
|
| | | | |
| | | |
| | | |
| | | | |
properties after the engine was deleted.
|
| | |\ \ \ |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The default target name for the autotests is the dir name and
the class name didnt change when we renamed the dir names.
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Was accidentally ignoring key movements even when an existing selection
meant that pressing right/left would do something.
Task-number: QT-2944
|
| | | | | | | | |
|
| | | | | |\ \ \ |
|
| | | | | | |/ /
| | | | |/| |
| | | | | | |
| | | | | | | |
is started. Also fix some memory leaks.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Perhaps instead, such 'private' property types should be registered by the using class?
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange()
notification. That seems wrong, but this change is a work-around.
|
| | | | | | | | |
|
| | | | |_|/ /
| | |/| | | |
|
| | | |/ / / |
|
| | | |\ \ \ |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | |/ / |
|
| | | |/ / |
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Setting an image source to image://providerid/imageid will pass the
request for imageid to the provider registered for providerid.
QmlImageProvider::request() is run in a low priority thread, so the
main thread is not blocked while the image is loaded/rendered.
Reviewed-by: Aaron Kennedy
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled commit 2b60b542a for all platforms.
Fixed missing repaints on S60 3.1.
Build break fix for QS60Style.
QS60Style: Branch indicator in tree view is misplaced
Compilation error fix: missing comma in enum list in QS60Style
Scroll bar handle/groove ends are squeezed (in nHD resolution)
QS60Style draws drop area as a black rect
Remove scrollbar context menu from QS60Style
Change a name of a variable to be more descriptive
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | | | |
| | | |
| | | |
| | | | |
get your git settings fixed, windows users!
|
| | |_|/
|/| |
| | |
| | | |
Fix messages in test data.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | | |
| | |
| | |
| | | |
Remove some unnecessary methods from the QmlMetaType class
|
