| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Revieved-by: trust-me
(cherry picked from commit 7e33165aa680e5b334182bdb34fae0f1aca69233)
|
| |
|
|
|
|
|
| |
Adding some image files.
Reveiwed-by: trustme
(cherry picked from commit c0d02030333c9f96188b5a425f2552472ab53325)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
|
| | | |
| | |
| | |
| | |
| | | |
The docs should probably not suggest a permission level has so many
permissions that in practice nobody needs it (or can get it)
|
| |\ \ \ |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Revert Merge Request 551. This introduces regressions to Qt.
Fixed scroll area size calculation on Mac.
Fix a race where QThread::exit() is "lost" when called after start()
make a partial build of linguist in no-gui config
make the code less of a trap
fix build from top level
Partially revert MR 543 changes to Linguist.
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
...
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
doc fixes
Don't test XmlListModel examples on platforms without QtXmlPatterns
More error output for QML_IMPORT_TRACE=1
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
...
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/javascriptblocks.qdoc
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QT-2845
|
| | | |/ / / |
|
| | | | | | |
|
| | | |\ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits)
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
Make sure WorkerScript thread is stopped on deletion. This also fixes
Release ListModel's worker agent on deletion.
Doc fixes
Fix example
Example code style improvements
Enable other wrapping modes.
TextEdit::wrap changed to TextEdit::wrapMode enumeration
Remove use of obsolete "Script" element.
unwarn
Replace "var" with "variant" in tests
Fix test after deletion of GraphicsObjectContainer.
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9705
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8514
|
| | | | | | |
|
| | | | | | |
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In shadow build environments, we cannot enforce that shared
library objects for plugins are located in the same directory
as the qmldir file. This makes it hard for Creator to support
mixed projects (qml/c++).
In order to gain more flexibility, the patch introduces a
pluginPathList to QDeclarativeEngine, which completes the existing
importsPathList.
The pluginPathList defaults to ["."], which indicates the directory
where the qmldir file is located in.
The qml viewer tool gains a command line option -P to add to the
pluginPathList.
For consistency, the -L option ("Library") has been renamed to
-I ("Import"). QDeclarativeEngine::importExtension() has been
renamed to QDeclarativeEngine::importPlugin().
The documentation has been adjusted accordingly.
Done with erikv.
Reviewed-by: erikv
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9701
|
| | | | | | | |
|
| | | | |/ /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7568
|
| | | | | | |
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: we don't ship a qconfig executable in the Windows CE packages
Fixed possible data corruption in the triangulating stroker.
Fixed caching of QPainter patterns in the GL 2 engine.
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
QTableView: fix spans corruption when removing spans.
Fixes painting artifacts when scaling a QGraphicsProxyWidget.
Fix <MemLeak> valgrind report shows memory leak for QImage::save().
Fix test sql for sql server.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9655
Reviewed-by: thartman
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | | |
This feature is not complete in this commit.
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
QtHelp: Fix auto tests.
Fix a crash when unloading libQtCore
Introduce a qconfig feature for QtDBus
Fix build after MR 543 merged.
Compile on 10.4.
revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
Remove expected failures after JavaScriptCore bug fix
...
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Correct some, and add some, information
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
Very cool.
|
| | | | | | |
|
| | | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
Coming soon!
Task: QTBUG-9504
|
| |\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| | |/
| |
| |
| |
| | |
Task-number: QT-1632
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
Task-number: QTBUG-8865
|
| | |
| |
| |
| | |
By popular demand.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Fix loading of _debug.dylib plugins under OSX.
Remove strange binding loop in Repeater test.
Improve Transform docs.
Add media elements to the QML Elements docs.
Doc fix
typo
Test cost of importing and resolving types (but not creating objects).
Make QML 'hello world' tutorial less confusing.
ModelNode::setObjectValue() must update the object cache.
Doc improvements, fixes
Remove references to deleted qmldebugger.
Fix Rectangle::gradient rotation doc.
Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
import "." first - i.e. override it by everything else.
Set positioner size to final size, rather than some random size mid animation
Remove effects from element list.
Fix imageprovider example compilation on Symbian arm
Remove capability flag not available in public SDKs
Fix plugin example compilation on Symbian arm
Fix compilation on Symbian winscw
...
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-9384
|
| | | | | |
|
| | | | | |
|
