| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | | | |
|
| | | | | |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make it possible to manually set the orientation of QML Viewer on Symbian
Limit the pixmap cache in space as well as in time.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-12142
Reviewed-by: Warwick Allison
This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor),
portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as
Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now
works on Symbian, but it's hidden when orientation mode is set to auto-orientation.
Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously
it only updated values between portrait and landscape. If your application only supports landscape or portrait
modes, just don't react to the inverted orientations.
Added orientation example screenorientation under examples/declarative.
The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait
to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows,
Linux and Symbian^3.
|
| | | |/ / /
| | | | |
| | | | |
| | | | | |
QTBUG-12590
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed configure on Solaris.
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed configure on Solaris.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes: "test: argument expected"
Need whitespace before closing ] .
Reviewed-by: Toby Tomkins
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QDesktopServices crashes when accessing the NULL X11 variable
Revert "Fix the byte order in QImage::fill for 24bpp formats"
Fix crash when setting font decorations on text drawn with QStaticText
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It appears that QDesktopServices for X11 assumes that it will be used
with a GUI application and may access the X11 variable. The X11 variable
will be NULL if it has not been initialized by the QApplication
initialization.
Merge-request: 2442
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This change the behavior. (as it break tests like drawImage_task258776
and tst_QPainter::drawhelper_blend_color)
The bug it fixes is not considered importent enough
This reverts commit 121c5143f1002734ff7aa62785ff14e0e6612aae and
d8c6ae24f94133828f4f1b536538e69c5e438202
|
| | | | |\ \ \ \ |
|
| | | | | |\ \ \ \
| | | | | |/ / /
| | | | |/| | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Qt has a run-time assert for implementing drawPolygon() in any subclass
of QPaintEngine, which will be hit if set font decorations on the font
used by QStaticText. Since we don't care about line decorations or any
other shapes drawn in the QTextLayout, we simply leave the
implementation empty.
Reviewed-by: Gunnar
|
| | | | |\ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This test was broken, and change 121c5143f1002734ff7aa62785ff14e0e6612aae exposed it.
Why would one check red == blue?
|
| | | | | | | |\ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
On the X11 paint engine, when rendering lines with float coordinates,
the lines were one pixel off if the decimal was > 0.5.
This fixes the WebKit bug https://bugs.webkit.org/show_bug.cgi?id=42248
Autotest by Yoann Lopes.
Reviewed-by: Simon Hausmann
Reviewed-by: Yoann Lopes
Reviewed-by: Andreas Kling
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QImage::fill() was using BGR ordering for 24-bit formats, which is
always incorrect as QImage does not support BGR. qrgb888 is the
correct 24-bit helper class that does use the proper order.
Merge-request: 2440
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
They are useless and cause warnings in the code.
Reviewed-by: Kent Hansen
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Kent Hansen
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed build break on Symbian versions earlier than S^3
Fixed qsymbianbearer.qtplugin exports in s60installs.pro
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
The following overload was added in S^3:
TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer,
TDataRecognitionResult& aDataType) const
In order to allow the backend to compile against earlier versions
of the platform, this patch calls the RecognizeData overload which
taking the same arguments as above, plus a filename (for which
KNullDesC is passed).
Task-number: QTBUG-6562
Reviewed-by: trustme
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
These exports incorrectly add EPOCROOT to the destination, making
it break when EPOCROOT includes drive letter.
Reviewed-by: axis
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-6562
Reviewed-by: Justin McPherson
|
| | | | | |_|_|_|_|/ /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The backend accesses the resource file path via MediaSource::url().
A small patch to Phonon was required to enable this, because by
default, Phonon passes a QIODevice, rather than the resource file
path, to the backend.
The backend uses this path to create a QResource object, through which
the memory buffer into which the resource file has been read can be
accessed. This buffer is wrapped in a Symbian 8-bit descriptor and
passed to the OpenDesL() function of the appropriate MMF client
utility API.
Playback only works for certain file formats, as the Symbian MIME type
recognizer does not always work. For example, playback of an audio
WAV resource file works, while playback of an MP3 resource file does
not.
Task-number: QTBUG-6562
Reviewed-by: Justin McPherson
|
| | | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure currentItem is released when the delegate changes
State doc fixes, improvements
Make sure ListView.nextSection attached property is set for the first item
Correctly apply PropertyChanges when entering an extended state
Update QtGui def files
|
| | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-12570
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Otherwise a new delegate isn't created for the currentItem.
GridView didn't release any item. It is now equivalent to LsitView.
Task-number: QTBUG-12548
Reviewed-by: Bea Lam
|
| | | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / / |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
directly from the base state.
Make sure qmlExecuteDeferred is called on the state being extended.
Task-number: QTBUG-12559
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-12333
Reviewed-by: Martin Jones
|
| | | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-12470
Reviewed-by: Bea Lam
|
| | | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
into 4.7
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Our stringToCMap implementation for CoreText that bypasses the shaping needs
to have basic support for font cascading / glyph substitution. We now use
CTFontCreateForString to determine the substitute font for missing glyphs.
Task-number: QTBUG-12411
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
In shadow builds, the directory QT_BUILD_TREE/mkspecs/features
isn't a mere symlink anymore. The directories below mkspecs/features
are copied and every single file is symlinked.
This makes it possible to place .prf files into a shadow build's
mkspecs/features directory, like Qt Mobility does with its mobility.prf,
without polluting the source directory.
Task-number: QTBUG-12545
Reviewed-by: ossi
|
| | | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
|
| | |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
style files
|
| | |\ \ \ \ \ \ \ \ |
|
