| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Backport more imports directory caching changes.
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes error reporting on Windows.
Change-Id: I49b559aa9d0c227be4e8e3d0fdc43c402273a302
Task-number: QTBUG-15899
Reviewed-by: Damian Jansen
|
| |
| |
| |
| |
| |
| |
| | |
Backported from Qt5 change a6da3b26
Change-Id: Ib1715f3d5c144775e475426ce4471000b5ae0645
Task-number: QTBUG-15899
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
A patch for 'Fix to QtOpenGL crash'
Always recreate backing store when TLW transparency changes
Crash in QDeclarativeCompiler::indexOfProperty
Fix to QtOpenGL crash
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In QDeclarativePropertyCache, plain integer bitfield overrideIndex is
initialized with -1 in class constructor. Unfortunately, ARM compiler
treats bitfields as unsigned, unless explicitly defined as signed [1].
Therefore, overrideIndex actually gets initial value of 2147483647,
which causes array operations done with the index to fail.
As a fix, define overrideIndex as signed int bitfield.
[1] http://www.keil.com/support/man/docs/armccref/armccref_Babjddhe.htm
Under bitfields/Note: "A plain bitfield, declared without either
signed or unsigned qualifiers, is treated as unsigned"
Task-number: QT-5285
Reviewed-by: Aaron Kennedy
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QML import path puts Qt dirs in correct Symbian order
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QML import path contains an entry for the standard
import location on each drive on Symbian. These were
being ordered so that Z:, the ROM drive, was listed
first. In fact the drive order was the reverse of the
normal Symbian drive search order. This had the effect
that upgraded versions of QML imports installed on
the device were generally ignored for older ROM based
versions.
The import path has now been changed to match the normal
Symbian drive search order. This will make it more likely
for upgraded QML imports to be picked up and used.
Task-number: QTBUG-21409
Reviewed-by: Shane Kearns
Reviewed-by: Martin Jones
|
|/
|
|
|
|
| |
Change-Id: I1c7b575e1ace2b879dba130cd31e3ff8cf67260a
Task-number: QTBUG-17770
Reviewed-by: Aaron Kennedy
|
|\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix crash in PropertyChanges.
Scroll correctly when cursorPosition is changed within onTextChanged.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't crash when adding an optimized binding to an object not associated
with a QDeclarativeEngine.
Change-Id: I4501e21e959380fedfafdc8bc477b330cffbce1b
Task-number: QTBUG-19914
Reviewed-by: Aaron Kennedy
|
|\ \
| |/
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarative: Fix QPerformanceTimer on Symbian
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QPerformanceTimer::elapsed() always returned 0 on Symbian. This
is because Q_OS_UNIX define is also set for Symbian. Fixed by moving
Q_OS_SYMBIAN before Q_OS_SYMBIAN, and fixing the logic.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-19669
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
|
|
| |
Memory is allocated and used without first clearing it. At
the least this annoys valgrind, but also has potential for real
problems.
Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d
Task-number: QTBUG-15187
Reviewed-by: Aaron Kennedy
|
|\
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Fix Symbian/Linux compilation breakage in plugins/qmltooling
Make QMLViewer startup animation stop after a while
Fix excessive scrolling in TextInput with mid string pre-edit text.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Trying to read a property marked as non-scriptable results in an
endless loop in QDeclarativePropertyCache::create .
Task-number: QTBUG-18758
Reviewed-by: Aaron Kennedy
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When resolving unqualified attached properties, we should use the scope
object, not the context object. Otherwise they will always resolve to the
root object of the context, regardless of where they are written.
In this example,
QtObject {
id: root
QtObject {
id: me
property int a: AttachedObject.x
}
}
the attached object should be loaded on the "me" object, not the "root"
object.
Change-Id: I386f886f62df7b8020c3ff703cdfc891d5739713
Reviewed-by: Martin Jones
|
|\ \
| |/
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
ListView has wrong keyPressEvent behaviour when vertical
Ensure view is positioned correctly when orientation changes.
Fix regression in wigglytext.qml
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change re-adds the code removed in
8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression),
while keeping the new code as well (to specially handle the case of
registration in componentCompleted()).
Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b
Task-number: QTBUG-18362
Reviewed-by: Aaron Kennedy
|
|\ \
| |/
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.
Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I80c228092271d4d9c5694607da7a123d06739731
Reviewed-by: Aaron Kennedy
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The script local filename was used to resolve the source URL rather
than the script URL.
Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce
Task-number: QTBUG-17977
Reviewed-by: Aaron Kennedy
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I4c246cbcf8d0168cb4af028d6d04088fe20cdbba
Task-number: QTBUG-17276
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Take whitespace before the opening bracket into account, e.g. save the newlines
in function f()\n{}
Task-number: QTBUG-18006
Done by Roberto Raggi
|
|\ \ \
| |/ /
| | /
| |/
|/|
| | |
Conflicts:
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/qml/qml.pri
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Autotest: make at least one update before checking if more are needed
Fix warning about id maybe used when uninitialised
Doc: setSslConfiguration also sets the CA certificates
Autotest: check that the type received is the expected one
Attempt to fix symbian 3.1 and 3.2 compile break.
Prevents crashing when ICO file has bad color table value
directfb: fix crash in client/server mode of qws
Make Qt/DirectFB less verbose about failing to load pixmaps.
Autotest: don't use the deprecated signal from QDBusConnectionInterface
Autotest: be nicer to the subprocess and SIGTERM it
Fix warnings in QtDeclarative
Autotest: avoid memory leaks if test fails
QtDBus: Make sure we can receive unknown types
QtDBus meta object: keep methods, signals and props with unknown types
Autotest: add a new test for parsing an introspection with unknown types
Make the QtDBus parser not complain about unknown things
fix-layer-getsurface-result-check-for-screen-size-determination
Bump QtWebKit version to 2.0.2
SSL: fix memory leak when loading certificates on Mac OS X
Add a mutex to protect the access to the QSet.
...
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
|
| | |\ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Support seperate versions of installed modules
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Changing header/footer size during creation caused recusion
Ensure section delegates are updated when the section property changes.
Make test compile
Disable lineHeight test while implementing the feature in master properly.
Initialize primitives when creating a new QVariant
modelChanged() should not be emitted until view is repopulated
AnimatedImage does not notify on status change.
Clarify case preservation in QDeclarativeImageProviders
Allow unknown types to be passed opaquely through signals
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Animations register to be started when the component is finalized,
but in the case of a binding, the registration doesn't happen until
we are already working with a copy of the finalization list. With this
patch, we no longer work with a copy, but with the actual list.
Change-Id: If460c250d2403590907e9ac854d277db68ba8b2a
Task-number: QTBUG-14042
Reviewed-by: Aaron Kennedy
|
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There is a copy of QDeclarativeListProperty in qgraphicsitem_p.h, which
confused qdoc.
Change-Id: I159b5e51af11a8b5874b0ffeb923cbd67df86d0d
Task-number: QTBUG-17555
|
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17444
Reviewed-by: Aaron Kennedy
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The not installed error will be issued if, after loading plugins and considering
the contents of qmldir, there are no elements in the particular minor version.
For example, if a plugin/qmldir provides the following types (either from C++ or
as QML files specified in the qmldir file):
Foo 1.1
Bar 1.3
importing versions 1.0, 1.2, or 1.4 will fail with the not installed error.
Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8
Task-number: QTBUG-17324
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Was causing assert failure on windows if the 'c:' was lower case,
since it was being added to the import path database with a lower
case and thus later lookups with an upper case 'c:' would fail.
This change fixes the check for whether the path refers to a
local path or not.
Task-number: QTBUG-16885
Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877
Reviewed-by: Martin Jones
|