| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '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
|
| | |/
|/| |
|
| |/
|
|
|
|
|
|
| |
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
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-14238
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed many spelling errors.
|
| | | |_|_|_|_|/
| |/| | | | | |
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13413
Reviewed-by: Andrew den Exter
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | | |
Reviewed-By: Thomas Hartmann
|
| |\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Tic-tac-toe: Fix z-order of status text.
Don't export QtDeclarative symbols needed by QtCreator on Symbian
Properties take precedence over methods
Call the correct vme meta object when connecting alias signals
Fix Twitter demo's list view for devices
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Bea Lam
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Build break is caused on some environments if ICON is defined for
non-application projects, as application_icon.prf doesn't get processed
for those, resulting in empty TARGETFILE field in bld.inf.
Task-number: QT-4193
Reviewed-by: Janne Koskinen
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits)
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
...
|
| | | |_|/
| |/| | |
|
| | | |/
| |/| |
|
| | | |
| | |
| | |
| | | |
old file name references.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Originally written by Jervey Kong.
Task-number: QTBUG-14154
Reviewed-by: David Boddie
|
| | |\ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-13705
Reviewed-by: Geir Vattekar
|
| |\ \ \ \ \ |
|
| | | |_|/ /
| |/| | | |
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Turns out that subtraction is not commutative. Who knew?
Task-number: QTBUG-13532
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
Doc clarification.
Fallback to A8 text rendering on Mac when LCD smoothing is disabled
Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1
Autotest that new "import Qt 4.7"s aren't added accidentally
Document "import QtQuick 1.0" change
Replace "import Qt 4.7" with "import QtQuick 1.0"
Add test for Qt 4.7 module
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Correct property type of PathAttribute::value in the docs.
Register QtQuick 1.0 module.
Remove unused AST node destructors.
Fix crash when trying to append a null transform to QDeclarativeItem.
Documentation.
Documentation fix for Flickable (mark content properties as real, not int).
QDeclarativeDebugClient: Fix gcc warning
QmlDebugService: Check that there is a receiver before sending messages
If a type is registered under several names, share the attached property object
QmlViewer: Fix typo in comment
QmlViewer: Fix assert on exit (Windows)
...
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Bearermonitor example
Merge-request: 827
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Small fixes to Browser.qml
More declarative autotests.
Fix example.
|
| | | | | |
|
