| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits)
QDeclarativeDebug: Make autotests more robust
Add sendParentChangeNotification to QGraphicsItem
Use setParentItem() instead of setParentItemHelper if componentComplete is true
QDeclarativeDebugClient: Make sure status is consistent
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
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '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
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.
Task-number: QTBUG-13902
Reviewed-by: axis
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QFontMetrics::lineWidth() for fonts with defined point size
Implemeting, exporting and autotesting QFont::lastResortFont()
Fixed compile error on non-Symbian platforms.
Fixed regression when typing in QTextControl based widgets on Symbian
Fixed incorrect snippet in BLD_INF_RULES documentation
Streamlined smart installer package creation
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13988
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
(cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
|
| | | |
|
| |\ \
| | |/ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-3171
Reviewed-by: David Boddie
|
| |\ \ |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | | |
Task-number: QTBUG-2210
Reviewed-by: David Boddie
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| |/
| |
| |
| |
| |
| |
| | |
Many things have changed with QML debugging in Qt Creator. Now docs
simply refer to Qt Creator documentation.
Reviewed-by: Leena Miettinen
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-12963
Reviewed-by: ck
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits)
Fixed compile warning on Windows.
Fixed painter path drawing on FBO without stencil buffer.
qmake: Make smart library merge architecture-aware
Slovenian translation: some updates and fixes
Fixed memory leak in Symbian when Options menu was launched.
Fixed color of cosmetic pens when printing under Windows.
Fixed infinite loop when loading jpeg without EOI from memory.
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Added galician translation
Support multisampled pbuffers under Windows.
tst_qpixmapfilter: Fix compilation in namespace
qtextcodec_symbian: Add few aliases
Give a warning in QPixmap::handle() if pixmap is not X11 class.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fix one hang of QNAM on Symbian.
Update QtDeclarative def files
Update QtGui def files
Update QtCore bwins def file
Fix Symbian def file for a9e5329168
Make build on Symbian
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | | |
|
| | |\ |
|
| | | |\ |
|
| | | | |\ |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Henry Haverinen
|
| | | |\ \ \ \ |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Henry Haverinen
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | |_|/ / /
| | |/| | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
resources.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: David Boddie
Tasks: QTBUG-10077
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This was descoped from Qt 4.7.
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Morten Engvoldsen
|
| | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | /
| | | | |_|/
| | | |/| | |
Conflicts:
src/gui/kernel/qgesturemanager.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html
This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-9946
Reviewed-by: David Boddie
|
| | | |\ \ \ \
| | | | |/ / / |
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Cleaned up the contradiction identified in QTBUG-10114.
Reviewed-by: David Boddie
Bug: QTBUG-8961, QTBUG-10114
|