| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Phonon exports template instantiations. These exports get weak symbol
binding, which is correct according to the C++ ABI, but the problem
is that elf2e32 has a bug which does not transfer the weak symbols
correctly to the dso file. Therefore, the example will work if you
have a prebuilt Qt version and use GCCE, but not if you build Qt from
scratch using GCCE.
For normal non-template symbols it is not a problem since they get
global bindings. RVCT also produces global bindings.
RevBy: Shane Kearns
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The maths was dodgy - producing far greater scaling than that provided
by PinchArea.
Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5
Task-number: QTBUG-17828
Reviewed-by: Michael Brasser
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '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.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17501
Reviewed-by: Martin Jones
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
...
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-16865
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Dynamic object in Docs explains QScriptValue argument.
SameGame and Dynamic scene now make use of overloadable.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
If there is no hotSpot defined for a gesture it cannot be propagated
propperly within GraphicsView.
Task-number: QTBUG-16618
Reviewed-by: Denis Dzyubenko
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Alan Alpert
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In many situations building succeeds without explicity including
this dir in the include path, probably due to a side-effect of
calling uic on the form in this project. However, it is known
to fail at least on mingw-cross-env. Anyway, it makes sense
to explcitly add this dir to the include path since a needed
header resides here.
Merge-request: 1016
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-15491
Reviewed-by: Michael Brasser
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits)
Doc: Added a missing license header.
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
Doc: Added a note about the Public Suffix List.
Doc: Fixed doc bug in Diagram Scene example
doc: Removed some empty \row commands from a table.
Doc: Added link to QML Basic Types in main Qt Quick page.
Doc: Added missing What's New information for Qt 4.6 and 4.7.
Doc: Fixed incorrect case in a page file name.
Doc: Added a link to the QML Basic Types page.
Doc: Removed duplicate external page reference.
Doc: Fixed a link to the correct searchPaths() function.
Doc: Added documentation about the use of null custom title bar widgets.
Doc: Added a missing external page reference.
Fixed the QML Focus document. Fixed snippets, images, and formatting.
Added QML coding convention for "private" properties.
Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.
Some whitespace fixes.
Fixed a bug by changing the id name to lower case.
...
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14169
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-16059
Reviewed-by: Christopher Ham
|
| | | | | |
|
| |\ \ \ \
| |/ / / |
|
| | | |/
| |/| |
|
| | | |
| | |
| | |
| | | |
This reverts commit 18b940539d0633f30ae055feedb48aeb15969814.
|
| |\ \ \ |
|
| | |/ / |
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
The 'Writing QML Components' is mainly a restructuring of the
'Extending types from QML' page. It also documents the signal
connect() function that was previously undocumented.
Task-number: QTBUG-15718, QTBUG-15138
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If developer specifies "CONFIG += localize_deployment" in .pro file,
the generated .loc and .pkg will now use translatable strings from
.ts files defined in TRANSLATIONS. The .ts files must have an
underscore and Qt language code at the end of the filename body
to be compatible with deployment localization. E.g. myapp_en.ts.
Running lupdate will generate these entries into .ts files:
- Application short caption
- Application long caption
- Package name
- Smart installer package name
Task-number: QTBUG-13917
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Janne Anttila
Reviewed-by: axis
|
| |/
|
|
| |
Task-number: QTBUG-15491
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update visual tests for Mac.
Run all QML visual tests now.
Make qmlvisual tests more stable
Add documentation about script evaluation context and allowed types
Maintain passing visualtests on X11
Fix errors in example code. Also reverts the example code to the old
Largely rewrite the Using QML in C++ Applications documentation. It
Document list type operations
Fix regression in 648eb76c and update visual tests.
Don't emit xChanged()/yChanged() twice.
Add testcase for QTBUG-13719.
Doc fix
highlightranges.qml example and visual test contained binding loop.
Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.
Regression: QDeclarativeText does not update when text turns empty
Qml Debugging: Only enable if explicitly requested
Regression: Text element breaks when using \n for separating lines
Removing a binding while it is being applied caused a crash.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Also, the currentIndex stayed -1 since the views all bound to each
others currentIndex, which starts as -1.
Task-number: QTBUG-14794
Reviewed-by: Yann Bodson
|
| |/
|
|
|
| |
Use the correct ui file when building in scratchbox.
Remove use of message boxes.
|
| |
|
|
|
|
|
|
|
|
| |
Only add ICON for Qt gui application projects that do not explicitly
want to suppress it in symbianpkgrules.pri. This logic should match
the logic used for setting RSS_RULES.icon_file and thus avoid
empty TARGETFILE in bld.inf mifconv extension.
Task-number: QT-4193
Reviewed-by: Janne Koskinen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Fixed case of a library file name to enable MinGW builds on Fedora.
Doc: Made Qt::TextLongestVariant internal again.
Doc: Fixed minor documentation issues.
Doc: Reorganized the platform and compiler notes pages.
Doc: Removed non-ASCII characters and reformatted the text.
Doc: Fixed documentation style and qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed snippet reference for the Getting Started QML guide.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Renamed an external reference to work around an auto-linking issue.
Doc: Fixed qdoc warnings.
Doc: Fixed links to the online BSD license information.
Doc: Fixed qdoc warnings.
Doc: Re-added a link to the Qt site related to testing tools.
Doc: Marked some new properties as internal for now.
Doc: Renamed a project file.
Doc: Added missing examples and snippets.
|
| | |\ |
|
| | |\ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14484
Reviewed-by: Marius Storm-Olsen
|
| | |\ \ \ \ |
|
| | | |\ \ \ \ |
|
| | |\ \ \ \ \ \
| | |/ / / / / |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QtWebKit Image Analyzer example.
|
| | |\ \ \ \ \ \
| | |/ / / / / |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-14238
|
