| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|/
|
|
|
|
|
|
| |
Also moves documentation of Qt global object to alongside code. Docs are slightly
misleading because they say "Qt::argb" etc. when "Qt.argb" would be clearer.
Downgrades QTBUG-7725 from P2 to P4 as remaining functions are standard webJS.
Task-number: QTBUG-7725
|
| |
|
|
|
|
|
|
|
|
| |
Add QCoreApplication::applicationLibraryPath again to the list of
directories to search for possible QML plugins.
Task-number: QTBUG-10771
Reviewed-by: mae
|
|
|
|
|
|
| |
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).
|
| |
|
| |
|
|
|
|
| |
Grrr
|
| |
|
|
|
|
| |
Task-number: QTBUG-10359
|
| |
|
|\ |
|
| | |
|
|/
|
|
| |
Task-number: QTBUG-10328
|
|
|
|
| |
QTBUG-10239
|
|
|
|
|
|
|
| |
Make sure the scriptclass is used.
Task-number: QTBUG-10329
Reviewed-by: Aaron Kennedy
|
|\ |
|
| | |
|
|/ |
|
| |
|
| |
|
|
|
|
|
|
| |
Warnings --.
Reviewed-by:TrustMe
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The patch improves the error messages when type resolving fails
and introduces a new debug utility QML_CHECK_TYPES.
If the environment variable is defined, type shadowing will be
reported as error.
Reviewed-by: Warwick Allison
|
| |
|
|
|
|
| |
eg. "import Qt 4.6" not valid.
|