| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Task-number: QTBUG-11315
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Small optimization when checking if MouseArea's onPressAndHold is
Fix autotest.
Fixed `nmake clean' breaking declarative imports on Windows.
Fix drawing flicker on Qml Viewer startup
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
Fix slow network access in qmlviewer (Windows)
Don't layout multiple times when an ancestor becomes (in)visible.
Add an example of animated item add/remove in ListView
Add test for PropertyChanges with attached properties.
Make declarative autotests compile on Symbian abld build system
Accept enter key in the webbrower demo url input.
Keep reported point/pixel size in sync.
Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
Ensure state operations assigned to the default state are triggered
Add image example.
Fix regression in input panel autotests
Improve docs about Qml component case sensitivity.
Add some performance tips to QML docs.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Small optimization when checking if MouseArea's onPressAndHold is
Fix autotest.
Fixed `nmake clean' breaking declarative imports on Windows.
Fix drawing flicker on Qml Viewer startup
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
Fix slow network access in qmlviewer (Windows)
Don't layout multiple times when an ancestor becomes (in)visible.
Add an example of animated item add/remove in ListView
Add test for PropertyChanges with attached properties.
Make declarative autotests compile on Symbian abld build system
Accept enter key in the webbrower demo url input.
Keep reported point/pixel size in sync.
Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
Ensure state operations assigned to the default state are triggered
Add image example.
Fix regression in input panel autotests
Improve docs about Qml component case sensitivity.
Add some performance tips to QML docs.
...
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10251 and QTBUG-11156
Reviewed-by: Martin Jones
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits)
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
Fix slow network access in qmlviewer (Windows)
Don't layout multiple times when an ancestor becomes (in)visible.
Add an example of animated item add/remove in ListView
Add test for PropertyChanges with attached properties.
Make declarative autotests compile on Symbian abld build system
Accept enter key in the webbrower demo url input.
Keep reported point/pixel size in sync.
Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
Ensure state operations assigned to the default state are triggered
Add image example.
Fix regression in input panel autotests
Improve docs about Qml component case sensitivity.
Add some performance tips to QML docs.
Move QListModelInterface into util.
Ensure ParticleMotionGravity always pulls in the right direction.
Remove version ifdefs from Particles; only 4.7 is supported.
Update docs for the runtime.orientation values
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If no proxy is defined in the preferences, qmlviewer uses systemProxyForQuery
to automatically retrieve the proxy settings of the Operating System. However,
calling systemProxyForQuery can take several seconds in case Windows to
automatically detect proxies (QTBUG-10106).
This hot fix therefore just disables querying the OS proxies on Windows.
Task-number: QTBUG-11261
Reviewed-by: Warwick Allison
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move QListModelInterface into util.
Ensure ParticleMotionGravity always pulls in the right direction.
Remove version ifdefs from Particles; only 4.7 is supported.
Update docs for the runtime.orientation values
Revert to Portrait/Landscape terminology for Orientation enum, with
Add more Q_AUTOTEST_EXPORTs
Improve input panel handling in declarative demos and examples
Always integer align anchor center points
Add header and footer to GridView
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
additional PortraitInverted and LandscapeInverted values. TopUp etc.
only indicates rotation which makes it difficult to resize the window
according to whether the device is in Portrait or Landscape orientation.
|
|/ / / /
| | | |
| | | |
| | | | |
Fixes "Invalid read of size 4" reported by valgrind.
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
trailing semicolon.
Reviewed-by: Rohan McGovern
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
add the containing directories of all files specified on the command
line to the list of project roots. otherwise, the strings from headers
which are included before being encountered on the command line will be
omitted.
Task-number: QTBUG-10345
|
| | |
| | |
| | |
| | | |
missed that in 60acaf5e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
unlike originally planned, we didn't remove the setting of the tool
paths from the qmake specs - for compat reasons. however, that means
that they will make the QT_BUILD_TREE handling in qtPrepareTool
ineffective, which meant that the qt build would try to use the tools
from an installed qt ...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the function provides a cross-platform way to determine the exact
pathname of our build tools (moc, etc.).
use it in our .prf files, so we don't have to rely on qmake's
unreliable path separator normalization magic in extra compiler
commands, which broke on mingw+sh in silent mode.
remove the bootstrap tool path setting from configure, as it is
redundant now.
Reviewed-by: joerg
Task-number: QTBUG-10633
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Synchronizing to latest tree
Adding correct hungarian translation
Search local directory if no qconfig file found in src/corelib/global/
Fix QT_NO_CLIPBOARD
Fix QT_NO_ACTION
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
translations/assistant_hu.ts: Translated: 231 of 231 (100%)
translations/designer_hu.ts: Translated: 85 of 1248 (6%)
translations/linguist_hu.ts: Translated: 393 of 393 (100%)
translations/qtconfig_hu.ts: Translated: 73 of 168 (43%)
translations/qt_help_hu.ts: Translated: 80 of 81 (98%)
translations/qt_hu.ts: Translated: 2402 of 2464 (97%)
translations/qvfb_hu.ts: Translated: 65 of 65 (100%)
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
| | |
| | |
| | | |
ConversionData::error() does already newline-terminate the strings.
|
|/ /
| |
| |
| | |
Task-number: QTBUG-8044
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
Revert "Split Symbian bearer plugin into three platform specfic plugins"
Don't poll non-polling engines when configurations are in use.
Doc: updating images
Fix a corner case where a gesture sometimes doesn't start.
write PO files without duplicated message ids
my changes
Fix failing bypassShaping autotest on the Mac OS X
More Pixmap cache key optimizations
QNAM: Improve child deletion order
QSslCertificate: support large serial numbers
Split Symbian bearer plugin into three platform specfic plugins
Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting
Some optimizations for QImage::load()
fix setRawData()
Fix QML crashes on the N900
doc: Added DITA XML generator
Fix build failure on Symbian 3.1.
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
...
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
encoding the qt context as a magic comment was no particularly good
idea, as it provided no disambiguation as far as gettext is concerned.
so instead encode the context into msgctxt.
Task-number: QTBUG-10307
|
| | |
| | |
| | |
| | | |
and adding highlighting
|
| |\ \ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
qdoc: Added DITA XML generator
doc: Fixed confusing ownership issue.
update Russian translations for Qt tools
update Russian translation for Qt libraries
QXmlSchema documentation correction
doc: Changed last breadcrumb to not be a link.
doc: Fixed reference to setSize(), which is in QRectF.
QNetworkCookie: do not accept cookies with non-alNum domain
QtDeclarative: Remove trailing commas in enums
Doc: MonotonicClock is obviously monotonic
|
| | |/ /
| |/| | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
At the moment, it is just like the HTML
generator, but with a different class name.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this contains some changes from symbian-commissioned "professional" translations
Merge-request: 621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10577
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
instead of Portrait/Landscape. The new orientations are named the same
as the orientations in the QtMobility sensors module.
Task-number: QTBUG-11106
Reviewed-by: akennedy
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Doc: Fixed an off-by-one error in an example.
Fix QT_NO_TEXTHTMLPARSER
Fix QT_NO_DOM
Fix QT_NO_TEXTSTREAM compilation errors.
Fix QT_NO_VALIDATOR compilation.
Doc: Removed a misleading sentence about a class constructor.
Doc: correcting docs in QDrag::exec
Doc: Adding note about QDrag::exec()
Revert behavior of QTextLayout::boundingRect() when line width is set
Fix unreasonably large width of QTextLayout::boundingRect()
Doc: replacing old image
Fix compilation with stricts compilers.
Fix QT_NO_DIRMODEL build error in QtDeclarative.
Revert "Added native key support to QSharedMemory API."
Revert "Improved documentation for QSharedMemory's key/setKey functions."
Fix a simple mistake in QXmlStreamReader::atEnd() docs.
Improved documentation for QSharedMemory's key/setKey functions.
Added native key support to QSharedMemory API.
Make test work with shadow builds again.
Doc: Corrected the documentation about the compression threshold.
...
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Base class is type-dependent. One must not use unqualified-id to access base member.
Reveiwed-by: Roberto Raggi
|
| |/ /
| | |
| | |
| | | |
Task-number: QT-1520
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix location of QtMultimedia def files
Freeze 4.7 def files on top of 4.6.3
Update def files for 4.6.3
Add runtime_graphics_system flag to QApplicationPrivate.
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| | | | | |\ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| | | | | | |\ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
QRuntimeGraphicsSystem is a proxy graphics system which
can dynamically switch underlying graphics system on runtime.
For example, switch from hardware accelerated graphics system
to raster graphics system on low GPU memory situation. This
feature is currently supported on Symbian platform.
Task-number: QT-3276
Reviewed-by: Jason Barron
|
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / |
|
| |/ / / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: mauricek
|
| | |_|_|_|_|_|/ /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-11049
Reviewed-by: ck
|
|/ / / / / / / / |
|