| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/generator.h
tools/qdoc3/htmlgenerator.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9004
Reviewed-by: David Boddie
|
| |
| |
| |
| | |
Task-number: QTBUG-9440
|
| |
| |
| |
| | |
Task-number: QTBUG-8942
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-11988
Reviewed-by: David Boddie
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15514
Reviewed-by: David Boddie
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
fix copying webkit guide under windows
Symbian: Fix backspace on empty lines of multiline textedits
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
patch by Rob Tomek.
Task-number: QTBUG-19155
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Improved comment finding code.
Added language information to the pure documentation parser.
Doc: Fixes to Qt tutorial
Fixed external link to DevNet Wiki.
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
Doc: Added a copy of the online style images for the qdoc manual.
Doc: Removed the Google Analytics script.
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Jerome Pasion
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
test: Fix `tst_qfiledialog' in a namespaced build
Fix files that don't end with a newline character
tests: Skip `qaudioinput' tests if there is no audio backend available
tests: fixed crash of tst_qdialog
tests: fixed crash of tst_qdialog
Fix QString compares to ""
Add test case name and drop parentheses for -datatags option.
Adding QTDIR validation in tst_symbols autotest
Disabled benchmarks referring to private headers.
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
Add license header to printdatatags autotests
Compile on symbian^3
Compile on Symbian^3.
Added -datatags option to QTestLib
Fixed failure of tst_qxmlquery::evaluateToReceiver
|
| |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | | |
|
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These are cosmetic changes to files that do not end
with a newline character.
Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a
Reviewed-by: Rohan McGovern
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add reference to tutorial on setting source file for QDeclarativeView.
Make use of compiled example code that demonstrate using Qt Resources in
calls to QDeclarativeView::setSource() .
Task-number: QTBUG-20985
Reviewed-by: Alan Alpert
|
|\ \ \ \ \ \ |
|
| |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/qtbinding.qdoc
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Passing the -datatags option to a QTestLib program prints the available
data tags to standard output.
Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:
Case 1: No tags:
f()
Case 2: Local tags only:
f() local tag 1
f() local tag 2
...
Case 3: Global tags only:
f() __global__ global tag 1
f() __global__ global tag 2
...
Case 4: Local and global tags:
f() local tag 1 __global__ global tag 1
f() local tag 2 __global__ global tag 1
...
f() local tag 1 __global__ global tag 2
f() local tag 2 __global__ global tag 2
...
...
Reviewed-by: Rohan McGovern
Task-number: QTQAINFRA-226
Change-Id: I14de203b586a0085b8efda8e62772711e44677d2
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-18982
Reviewed-by: Kim Motoyoshi Kalland
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-20350
|
| | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: TrustMe
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/external-resources.qdoc
|
| | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-20216
Reviewed-by: Laszlo Agocs
|
| | | |\ \ \ \ |
|
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Direct subclasses of QAbstractItemModel are unnaffected as they can update
internal data in a slot connected to the sourceModel's modelReset signal or
layoutChanged signal.
Rehabilitated for 4.8. Should be reverted again in Qt 5.
Reviewed-by: gabi
Merge-request: 694
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: David Boddie <david.boddie@nokia.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
-removed link to "What's New in Qt 4.7"
-replaced online HTTP links with qhelp links
-wrote material for "What's New in Qt 4.8"
Reviewed by: David Boddie <david.boddie@nokia.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
(cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
(cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
|
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
(cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
New files after previous license change round.
Reviewed-by: Trust Me
|
| | |\ \ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section.
Reviewed-by: Kim Gronholm
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes.
Reviewed-by: Kim Gronholm
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
trivial: fix typo in comment
changelog
docu update for QNX 6.5
get rid of anacronysm
massive improvements for the QNX screen driver
massive improvements for the QNX mouse driver
massive improvements for the QNX keyboard driver
disable the Embedded Linux data directory permissions check for QNX
skip two subtests that are known to fail on QNX
implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
add a configure-time check for an IPC support
make QProcess really work on QNX
make the kernel attempt to emulate an instruction with a misaligned access
use RoundRobin scheduler by default on QNX
a major refactoring of the mkspecs tree for QNX
buildfix for qmake
|
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits)
Update internal state before emitting configurationChanged() signals.
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Fixed qmlshadersplugin on windows VC2008 toolchain.
Reset input context in Symbian when another window is opened.
KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
Close context menus during orientation change.
Have -small-screen enabled in certain examples on Symbian always.
Update Japanese translations.
Revert some of "Make QMLViewer startup animation stop after a while"
Fix for winscw QtGui.def
Add private method for flushing the pixmap cache.
QDeclarative: Fix QPerformanceTimer on Symbian
Fix QTreeWidget autotest cases on Symbian/VGA
Increase SSL readbuffer 1 -> 16 kB
Fix pixel metrics for Symbian VGA devices
Revert "Fix QNetworkConfigurationManager usage outside main thread first"
Avoid buffer overrun in QMacPixmapData resizing
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Fix tst_QGraphicsItem::sorting() test case for Symbian
Fix QHeaderView test case for VGA Symbian devices.
...
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/gui/styles/qs60style.cpp
|
| | | | |\ \ \ \ \
| | | | | | |_|/ /
| | | | | |/| | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | | | | |\ \ \ \
| | | | | | |_|/ /
| | | | | |/| | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|