| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15720
Reviewed-by: Martin Jones
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
file used by Qt demos
Task-number: QT-4197
Reviewed-by: Jason Barron
* breaks compilation of releases that omit Qt demos directory
* qt import plugins have different deployment configuration than demo applications
* declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri
that is basically a copy from qpluginbase.pri written for plugins
|
|/
|
|
|
|
|
|
|
|
| |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
| |
Setting DESTDIR=. shows an error from mv trying to move the file from
the current directory to the same current directory.
Reviewed-by: axis
|
| |
|
|
|
|
| |
Reviewed-by: David Boddie
|
| |
|
| |
|
|
|
|
| |
...and a set of functional group pages.
|
|
|
|
|
|
|
|
|
| |
In the QML gesture example we access properties of the gesture by just
accessing the "gesture" property, which is in fact in a GestureArea. To make it
work I've set the GestureArea as a scope of the evaluated javascript
expression.
Reviewed-by: Warwick Allison
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QML plugin.
Before the patch if the evaluation fails (for any reason - because you access
invalid or non-existing property, or because of a spelling mistake, etc), the
expression will be silently ignored, making if very hard to figure out what is
going wrong.
The patch makes sure the error description will be printed on the output.
Reviewed-by: Warwick Allison
|
|
|
|
|
| |
Reviewed-by: Zeno Albisser
Reviewed-by: Volker Hilsheimer
|
|\ |
|
| |
| |
| |
| | |
Task-number: QTBUG-11917
|
|/
|
|
| |
Task-number: QTBUG-11512
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't write to the logger widget while the application is closing down.
Fix exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
|
| | | |
|
| |/
| |
| |
| | |
RevBy: Trust me
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QDeclarativePixmapCache was both slow, and very trickey to use correctly.
Many QML elements did not correctly cancel outstanding requests, which leads
to pixmaps leaking indefinately. Other elements, such as Text, were
subject to race conditions that meant they may never actually load all their
images.
QDeclarativePixmap is a single class than encapsulates the action of
fetching a pixmap, as well as the pixmap itself and the responsibility of
canceling outstanding requests. Rather than relying on Qt's pixmap cache
that doesn't cache all the information QML needs, QDeclarativePixmap
implements its own cache, that correctly degrades over time (unlike
QPixmapCache that can stop expiring items in some conditions).
Reviewed-by: Warwick Allison
|
|
|
|
| |
Task-number: QTBUG-11754
|
|
|
|
|
|
| |
...otherwise we cannot Symbian sign them.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
| |
Since plugin and import paths variables were moved to symbian.conf,
there were many unnecessary load(data_caging_paths) statements
left in applications.
Task-number: QTBUG-11619
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
src/3rdparty/webkit
Also change a bit the demo due to a little API change. The module is not
org.webkit but QtWebKit now.
Reviewed-by:simon hausmann
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (39 commits)
Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and
Document attached properties
Add 'on' prefix to documentation of signals
Stablize qmlviewer test
Improve test stability.
qmlviewer: ensure that only clicks on the current file list are handled.
Doc improvements: move some example code to snippets, add screenshots,
Move some example code into snippets/ and add other doc fixes
Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange
Fix GridView bounds behavior with snapping enabled.
Small optimization when checking if MouseArea's onPressAndHold is
Fix autotest.
Fixed `nmake clean' breaking declarative imports on Windows.
Fix drawing flicker on Qml Viewer startup
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
Fix slow network access in qmlviewer (Windows)
Don't layout multiple times when an ancestor becomes (in)visible.
Add an example of animated item add/remove in ListView
...
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Generally, doing a `clean' ought to clean up space by deleting
intermediate objects, but leave the build in a working state
(as opposed to `distclean' which deletes intermediate and target
objects).
For this to work for declarative imports, the qmldir file should
be treated as a target, not an intermediate object.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move QListModelInterface into util.
Ensure ParticleMotionGravity always pulls in the right direction.
Remove version ifdefs from Particles; only 4.7 is supported.
Update docs for the runtime.orientation values
Revert to Portrait/Landscape terminology for Orientation enum, with
Add more Q_AUTOTEST_EXPORTs
Improve input panel handling in declarative demos and examples
Always integer align anchor center points
Add header and footer to GridView
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move QListModelInterface into util.
Ensure ParticleMotionGravity always pulls in the right direction.
Remove version ifdefs from Particles; only 4.7 is supported.
Update docs for the runtime.orientation values
Revert to Portrait/Landscape terminology for Orientation enum, with
Add more Q_AUTOTEST_EXPORTs
Improve input panel handling in declarative demos and examples
Always integer align anchor center points
Add header and footer to GridView
|
| | | | |
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qml plugins are need also to be renamed for a qtlibinfix.
plugins/qpluginbase.pri does taht renaming, thus it needs to
be included by qml projects just as it needs to be included
by any other Qt plugin project.
I am just including plugins/qpluginbase.pri for Symbian for
now. If needed, include it also for other platforms.
|
|/ /
| |
| |
| |
| | |
Merge-request: 657
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|/
|
|
|
| |
Merge-request: 535
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
|
|
|
|
|
|
| |
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Merge-request: 652
Merge-request: 652
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
|
|
|
|
|
| |
This is a very simple approach, I don't know if a more nuanced system
would be appropriate.
Task-number: QTBUG-11025
|
|
|
|
|
| |
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
|
| |
| |
| |
| |
| | |
Task-number: QT-3315
Reviewed-by: Martin Jones
|
|\ \
| |/ |
|
| |\
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits)
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
Don't crash if the target parent is destroyed.
Introduce a threaded interpreter for QML binding bytecode
Bug moved.
doc
doc
Remove image example (covered in class docs)
When changing Loader source, remove old item from scene immediately.
Add missing .qmlproject files
Fix folderlistmodel with qt namespace
Renaming "Qml Launcher" back to "QML Viewer"
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
Make sure strings are escaped when returned via asScript.
...
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
|
| | | |
|
| |/ |
|