| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Give better error message when using unsupported lookbehinds in QRegExp
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 1456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT
Add GL_EXT_texture_format_BGRA8888 support.
Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"
Correction for effectiveBoundingRect() calculation for QGraphicsItem
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT
Add GL_EXT_texture_format_BGRA8888 support.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
glGetBooleanv generates an error if this
param isn't supported. This error generates wrong
warnings in later states.
Reviewed-by: Eskil
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QtOpenGL supports GL_IMG_texture_format_BGRA8888
but GL_EXT_texture_format_BGRA8888 is missing.
These extensions are essentially the same.
Task-number: QTBUG-22538
Reviewed-by: Samuel Rødal
|
| | | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"
Correction for effectiveBoundingRect() calculation for QGraphicsItem
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 7925f107814e46deb0848d9e6016721ceebfb521.
Needed to fix regressed auto-test
tst_qgraphicsview::update_ancestorClipsChildrenToShape2.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QGraphicsItemPrivate::effectiveBoundingRect() should use ItemClipsChildrenToShape
flag from the parent while looping to check for clipping and not use
its own AncestorClipsChildren flag.
By using AncestorClipsChildren, you're checking if one of your ancestors
clips you, but you really want to know if your direct parent clips you.
Merge-request: 1419
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (67 commits)
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
QStyleSheet example used a property that is hidden.
QList document referenced to non existing function
QXmlQuery::bindVariable documentation bug
Fix multiple typos in QLineF documentation.
Qmake project file docs lacked information.
Documentation error in SSL document
Fix multiple typos in documentation.
Fix for QVector::toList - code example documentation.
Supporting parallel pointer event delivery on Symbian
SSL documentation: correct enum name
...
|
| | | | |\ \ |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Sentences should end with a period! (Poor man's rebuild trigger.)
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reis Jr
Workaround MSVC2010 problems when linking QtWebKit
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).
Change suggested by Simo Falt <simo.falt@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reis Jr
dos2unix on a webkit source file (fix support for Visual Studio)
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.
Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix QFont related compilation errors on Mac OSX Carbon
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix QFont related compilation errors on Mac OSX Carbon
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-22318
Merge-request: 1434
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
| | |\ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Correct faulty 4.7->4.8 merge of Symbian def-files
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (62 commits)
Correct faulty 4.7->4.8 merge of Symbian def-files
SSL documentation: correct enum name
Updated changelog for Qt 4.8
Fix QFile::copy() returning false but error() being NoError
Symbian - disable memory mapping in QNetworkDiskCache
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
QIODevice - disallow setTextMode when not open
Adding items to a view with no delegate crashes.
Update changelog for Qt 4.8
Fix possible crash in glyph cache when deleting and creating contexts
Added Lithuanian translation of Qt.
Remove idc from mingw build.
Update changelog for Qt 4.8
Update changelog for Qt 4.8
Doc: Fix example code
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Add the ability to enable various SSL bug workarounds.
Fix security issue on website due to bad JS.
Fix security problem on webpage due to bad JS
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Done-with: Pasi Pentikainen
Reviewed-by: Jani Hautakangas
|
| | | | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
QStyleSheet example used a property that is hidden.
QList document referenced to non existing function
QXmlQuery::bindVariable documentation bug
Fix multiple typos in QLineF documentation.
Qmake project file docs lacked information.
Documentation error in SSL document
Fix multiple typos in documentation.
Fix for QVector::toList - code example documentation.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In the documentation there was missing icon in the
Object Inspector section. Added reference to
editbreaklayout.png icon and cleared a bit the
description. Added also the image to the
doc/src/images - folder.
Task-number: QTBUG-17739
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Documentation states that QTextStream::readLine() is used but
the example uses ">>" operator. Changed the example to use
readLine()-method.
Task-number: QTBUG-7678
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Document instructed to user qApp->x11Info() to access
x11Info in the examples. The QApplication doesn't have
x11Info() -method, QWidget does. Changed the examples
to use QWidget instead of QApplication.
Task-number: QTBUG-18544
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In the example there was told to use
button.evaluateJavaScript("click()"); which doesn't work.
Instead of "click()" it should be "this.click()".
Changed to "this.click()".
Task-number: QTBUG-17029
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QSPlitter::handle:pressed - example missed "image:" text
when image is set. Added "image:".
Task-number: QTBUG-20069
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In the examples the const char* variable was compared
to QString with "==" operator which doesn't work. Changed
the comparison to use qstrcmp - method.
Task-number: QTBUG-20089
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QGLColormap example missed int argc and char *argv[] from
main - method. Filling the QGLColormap with for - loop
was not working because of the 0 - size. Added arguments
to main - method and changed the filling so that
for-loop uses size of 256.
Task-number: QTBUG-3563
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QPointer didn't mention QWeakPointer although those are
"related" to each other. Added link to "see also" section.
Task-number: QTBUG-20721
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fixed "SBSv2" and "Installing qt for the Symbian platform"
links from the installation.qdoc. Fixed platform security
link from the external-resources.qdoc.
Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Documentation didn't mention which unit (B,kB,MB) is used
in setMaximumCacheSize and maximumCacheSize. Added unit to
be bytes.
Task-number: QTBUG-15562
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In the QStyleSheet documentation an example for boolean used QDialog {etch-disabled-text:1} property that is undocumented.
Changed the property to QDialogButtonBox{ dialogbuttonbox-buttons-have-icons: 1; } that is documented.
Task-number: QTBUG-11489
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QList documentation introduces a QStringList-class and states that it has function: QStringList::find. Function does not exist.
Changed so that the mention of the QStringList::find-function is removed from the documentation.
Task-number: QTBUG-16164
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Second code example in the documentation stated that the setQuery-method should be called before bindVariable-method.
Changed so that bindVariable-method is called first and then the setQuery-method as it should be.
Task-number: QTBUG-17025
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QLineF::angleTo, QLineF::setLength(), QLineF::dx() and QLineF::dy()
were missing detailed information
QLineF::angleTo - method returns the angle of two lines compared to
each other. Documentation stated that the return value is in degrees.
This fix adds specific information that the return value (angle)
is returned in _positive_ degrees. setLength()-method missed
information whether the angle is also changed if the given length
is negative. Added mention that angle is also changed. dx() and dy()
didn't mention whether the return value is negative or positive.
Added mention that positive if p2()>=p1() else negative.
Task-numbers: QTBUG-14759, QTBUG-14756, QTBUG-14677
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to
the qmake advanced usage - page where "*="-usage is explained.
Task-number: QTBUG-9675
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The order of setting environment variable OPENSSL_LIBS and configure was wrong. OPENSSL_LIBS is now instructed to be set first before configure.
Task-number: QTBUG-14521
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Link typo in the forum nokia icon article. Typo in
the Symbian qt introduction document. Typos in the
Diagram Scene example documentation.
The link url was ending with a slash character in the icon
article. Slash characted removed. In the symbian introduction
doc there was a missing "p" character in the environment
variables listing (QT_SIS_OPTIONS). There was 6 typos
in the Diagram Scene example documentation.
Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Code example in the documentation used QString values in QVector<double>.
Task-number: QTBUG-21067
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | / / / / /
| | |_|_|/ / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Supporting parallel pointer event delivery on Symbian
Removed unix specific mmap use from QString benchmark
|
| | | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Supporting parallel pointer event delivery on Symbian
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Symbian's wserv and cone are introducing APIs to send apps position
updates for multiple pointers in one message.
The change consists of a refactoring of processTouchEvent() to handle
multiple pointer changes, enabling receipt of the new messages, and
handling of the new messages.
Task-number: QTBUG-18286
Reviewed-by: Shane Kearns
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Removed unix specific mmap use from QString benchmark
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The mmap flags MAP_ANONYMOUS and MAP_POPULATE are unix specific, and
are not supported by Symbian's posix headers. The benchmark code using
them, already unix-only, now is removed from Symbian builds.
Task-number: QTBUG-18197
Reviewed-by: Shane Kearns
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
SSL documentation: correct enum name
|
| | | | | | | | | | | |
|
