| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enable the remote debugging of QDeclarativeEngines only after
QDeclarativeDebugHelper::enableDebugging()
has been called.
Approved by 4.7 Program Team.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)
Conflicts:
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/eabi/QtDeclarativeu.def
|
| |
|
|
|
|
|
|
|
|
| |
Qt 4.7 is still supported, but deprecated.
Reviewed-by: Martin Jones
Task-number: QTBUG-13799
(cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is important for Bauhaus to ensure that we can
edit properties and states dynamically in the visual
editor
Most of the changes consist of added functions
for Bauhaus, that do not affect any current
behaviour.
Important changes:
QDeclarativeAbstractBinding is holding a
QSharedPointer to itself so that other classes
can hold a weak reference to avoid accessing
dangling pointers while keeping track of bindings.
QDeclarativeStateOperation now has its own private class
QDeclarativeStateOperationPrivate to hold a pointer back
to QDeclarativeState since the parent is not set correctly
in every context.
QDeclarativePropertyChangesPrivate does now hold a
QDeclarativeGuard instead of a raw pointer to the
target QObject. In Bauhaus the target object might
be deleted.
Reviewed-by: Aaron Kennedy
|
|\ |
|
| |
| |
| |
| | |
QTBUG-13047
|
|/ |
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13178
Reviewed-by: Martin Jones
|
|/ |
|
|
|
|
|
|
|
|
|
| |
It is already a singleton, just formalize it so it can be used in other
files than qdeclarativeengine.cpp
This also remove the global olbject QDeclarativeEngineDebugServer::m_engines
Reviewed-by: Lasse Holmstedt
|
|
|
|
|
| |
Task-number:
Reviewed-by: Aaron Kennedy
|
|
|
|
| |
Also changes the line documenting the quit signal on QDeclarativeEngine.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
when processing.
The point is to be able to process images in a thread. If the mutex
is locked, this is useless.
Use case is a slow QDeclarativeImageProvider that generates thumbmails
from large files. Even with the asynchronous attribute set to true, the
gui thread would be blocked by the mutex.
By using QSharedPointer, I also fix the leak of the providers (which
were not deleted)
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/elements.qdoc
|
| |
| |
| |
| | |
...and a set of functional group pages.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
|
| |
| |
| |
| | |
Either someone removed the QML: prefix, or it was never there.
|
|/
|
|
|
| |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
|
| |
|
|
|
|
|
| |
Merge-request: 757
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
| |
this page from other documentation.
Task-number: QTBUG-12446
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| |
| |
| |
| |
| | |
Merge-request: 730
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|/ |
|
|
|
|
|
| |
Task-number: QTBUG-12322
Reviewed-by: Aaron Kennedy
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
fix qconfig.h aliased header creation
fix warning directive on gnuc
qdoc: Removed navigation arrow that was causing display problems.
Silence warning when building with MSVC 2005
Fix an Assert in QTextTable
Revert "Fix an Assert in QTextTable"
Attempt to fix build failure with msvc200{5,8} on Windows XP.
fix macx not having UNICODE in DEFINES any more
doc: Fixed several qdoc warnings.
Fix an Assert in QTextTable
doc: Fixed several qdoc warnings.
QSslSocket: Improve error handling
qdoc: Fixed several <div> elements that had the "/>" ending.
QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
qdoc: Fixed breadcrumbs for QML examples.
remove redundand translations project files
make projects lupdate-friendly
Timing fix for slow devices.
QNAM: Add future enum attribute for Zerocopy QNAM
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | | |
|
| | | |
|
| |/
|/| |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
synchronous loading of QImages. (QPixmaps can only be created in the
main thread so they will always be loaded synchronously).
This changes request() to requestImage() and adds requestPixmap()
for pixmap support.
Task-number: QTBUG-11989
|
| | |
|
| | |
|
|/
|
|
|
| |
where applicable, and remove or rename references to 'qml' tool. Also
improve QML Viewer docs.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (46 commits)
Ensure Loader item change listener is removed when Loader is destroyed
Adapt all qmlviewer testcases to the code changes in the actual viewer.
Stop QMLLauncher from crashing on exit on Mac when quitting app via the
VisualDataModel hasModelChildren role shadowed user roles.
Allow positioning of ListView items width sub-pixel precision.
Examples clean up
Docs
Improve appearance when scaling
Tweak Qt Demo Behaviour
forget to rename the moc include when renaming deviceorientation_maemo.cpp
fix namespace macros
fix QML Viewer resize modes
forgot to cleanup the code a bit after adding Maemo5 support
Make the QML viewer usable on the N900
Test QTBUG-11222
Test ListElement type via type system, not string comparison.
Test only on X11, not only on Linux (which includes embedded).
Handle enums in method arguments in the same way as QtScript
Allow custom parsers to handle attached properties
Allow components to be created from .pragma library JS files
...
|
| |
| |
| |
| | |
QTBUG-11507
|
|/
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix example code and image
Fix doc
Fix some bugs in the QML Web Browser buttons
Fix zoom bug in QML Web Browser demo
Fix Typo
Various doc fixes and improvements
Document issues with rectangle border width of 1 where clipping is used
Simplify selection setting. Make TextInput more like TextEdit.
|
| | |
|
|\ \
| |/
|/|
| |
| | |
Merge-request: 649
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Also augmented the docs for both functions a little.
Task-number: QTBUG-10926
|
| | |
|