| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: (58 commits)
Fine-tune the tests being run on the CI system.
Standardize selection color in visual test
Use GLIBC functions on any GLIBC architecture.
tst_qnetworkreply: Fix ugly test
Fix license text.
Remove pointSize from visual tests
Update visuals for X11
Doc: fix a typo in QML/Qt UI integration
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Remove some excess pngs
Update qml visual tests
VisualDataModel::count should be 0 until a valid delegate is set.
Doc: Remove default from PathView path property
Record images on more than just the first frame.
Turn off font antialiasing during tests.
Shrink size of a visual test
doc: Fix documentation of QTextEdit::setDocument
Fixed QGesture autotest for QGesture lazy deletion.
compile with quintptr instead of intptr_t
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/kernel/qgesturemanager.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Changes in qmake/generators/win32/msvc_objectmodel.cpp come
from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fine-tune the tests being run on the CI system.
Standardize selection color in visual test
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We don't want to bother running tests on QWS, or text tests on X11 until
they update the ubuntu version.
Task-number: QTBUG-14792
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14792
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Properly use the event loop.
Signals have to be connected directly after using the get()
method of QNetworkAccessManager. Else they might have already
been emitted while the event loop was spinning.
Reviewed-by: Peter Hartmann
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Too unstable
Task-number: QTBUG-14792
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Text visual tests may be dependant on the specific version of
libfreetype. Comparison images have been regenerated with the specific
version that the test machines use.
Task-number: QTBUG-14792
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These are no longer used by these tests
Task-number: QTBUG-14792
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There are no visual items if there is no delegate.
Task-number: QTBUG-14781
Reviewed-by: Robert Griebl
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed QGesture autotest for QGesture lazy deletion.
Crash fix, when the Object will be deleted during handling a QGestureEvent.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed By: Trust Me
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
compile with quintptr instead of intptr_t
Enable OpenGL scissors test
Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi
Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait
QNAM HTTP: Ignore double content-length headers
Don't pack Harfbuzz structs, this causes unaligned access crashes.
qmake vcxproj generator: fix description of custom build tools
Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
qmake vcxproj generator: fix description of custom build tools
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
...
|
| | | | | | | | |
|
| | | | | | |\ \
| | | | | | |/
| | | | | |/|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Ignore double content-length headers
Don't pack Harfbuzz structs, this causes unaligned access crashes.
qmake vcxproj generator: fix description of custom build tools
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-15311
Reviewed-by: ogoffart
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added guidelines for size, and shrunk tests that exceeded them.
Also updated the visuals for all text tests now that antialiasing is off
Also some other minor cleanups.
Also had to update the visuals for all tests, due to the bug in
generating the test scripts being fixed (all need to be remade).
Task-number: QTBUG-14792
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Font antialiasing varies from machine to machine, and so is too unstable
Also switching to a monospaced font in visual tests to attempt to
pre-empt another possible source of instability.
This commit also slightly increases verbosity of test failure messages
to be more useful in the CI system
Task-number: QTBUG-14792
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-14792
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If the size of an item was less than one its endPosition() was less
than its position(), which caused incorrect layout (overlapping items).
Task-number: QTBUG-15242
Reviewed-by: Yann Bodson
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Previous commit means that the snapshots are in different frames. All
tests must be updated.
Task-number: QTBUG-14792
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Colored rects are better than text. At least here.
Task-number: QTBUG-14792
|
| | | | |\ \ \ |
|
| | | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Extra semicolons break building with sun studio.
Task-number: QTBUG-15326
Reviewed-by: Alan Alpert
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
One case of non-standardized text, and one case of what is presumably
random number generation.
Task-number: QTBUG-14792
|
| | |\ \ \ \
| | |/ / / |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix bidi PDF mark support in Core Text shaper
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When Core Text shaping a string like LRE ... PDF, it won't leave
a zero width glyph for the PDF mark, it is not consistent with
HarfBuzz and will cause issues in our text engine (the last glyph
of the string will be considered as a ligature). This hack
appended such a zero width glyph to fix that.
Reviewed-by: Eskil
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | | |
The benchmarks are subject to change, so it's nice to know
which versions are in the Qt repository.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A single digit after RTL text will be considered as RTL because it
was treated as Other Neutral (DirON), it can be solved by changing
it to DirAN.
Task-number: QTBUG-2795
Reviewed-by: Lars Knoll
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Introduced new class QAnimationDriver for plugging in what drives animations
Use correct font for menu item shortcuts
Fix text rendering offset for raster engine on Mac
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We need such a concept in place in order to do animations that are driven
by vertical sync rather than QTimer, as vertical sync comes constantly at
16.66 ms. This means that animations do will not be jerking...
Reviewed-by: bnilsen
|
| | | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
Fix auto-test regression in tst_QDoubleValidator
QS60Style: Color calculation should be optimized
QS60Style: Color calculation should be optimized
With some locales, QDoubleValidator would not accept "C" locale valid numbers
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The locale from a previous test was not cleared.
Another issue has been detected, though, and reported as QTBUG-15210.
Reviewed-by: Thierry
|
| | | | | |\ |
|
| | | | | |\ \ |
|
| | | | | |\ \ \ |
|
| | | | | |\ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Locales using dot as thousands delimiter and comma as decimal
separator are prone to this error.
This is a regression introduced by commit b81b8e43ad57183ed66.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG_14935
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
They were in wrong section of the file due to editing error and
therefore ignored.
Reviewed-by: Markus Goetz
|
| | | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
remove pointless assignment of deprecated variable
fix tst_headers
Fixed a shell syntax error in configure
Clear X11 structure before use
Make operator QRectF const
Fix GC-related crash in QScriptValue::setData()
get rid of dependency on QtGui
Removed implicity QtGui linking from icd.pro as it is not needed.
DFB: Make sure QPixmap::hasAlpha is respected
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fix the generator and the generated file to ensure that the string
"generated" appears in the first line.
|
| | | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Clear X11 structure before use
Make operator QRectF const
Fix GC-related crash in QScriptValue::setData()
get rid of dependency on QtGui
Removed implicity QtGui linking from icd.pro as it is not needed.
DFB: Make sure QPixmap::hasAlpha is respected
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Yet another missing API shim.
When converting the QScriptValue to JSC, a JSCell may be allocated,
which can cause the GC to trigger.
If an identifier (JSC::Identifier) is then garbage collected, the
destructor will try to remove itself from the currentIdentifierTable().
Because the API shim was missing, the identifier table was 0.
It's difficult to create a bulletproof test for this case, but the
attached test is a best effort (it crashes on my machine without the
fix).
Task-number: QTBUG-15144
Reviewed-by: Jedrzej Nowacki
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
> data.cpp:2: error: 'ushort' does not name a type
> data.cpp:1133: error: 'ushort' does not name a type
and lot of
> data.cpp:1276: error: too many initializers for 'StringCollection'
when the issue with ushort is fixed (by including qglobal.h, for example)
a bunch of some new build errors occurs:
> data.cpp:4: error: 'stringCollectionData' was declared 'extern' and later 'static'
> data.h:54: error: previous declaration of 'stringCollectionData'
> data.cpp:1131: error: redefinition of 'struct StringCollection'
> data.h:48: error: previous definition of 'struct StringCollection'
> data.cpp:1136: error: invalid type in declaration before '=' token
> data.cpp:1136: error: conflicting declaration 'int stringCollection []'
> data.h:55: error: 'stringCollection' has a previous declaration as 'StringCollection stringCollection []
> data.cpp:1279: error: 'stringCollectionCount' was declared 'extern' and later 'static'
> data.h:56: error: previous declaration of 'stringCollectionCount'
Merge-request: 910
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
|
