| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
SUBDIRS+=../path/to/lackey from two different places means that qmake
sees the lackey project twice. This breaks the vcproj generator.
Make it so that lackey is only referred to once.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These tests were doing:
SUBDIRS+=../../../tools/assistant/lib
... to ensure that part of Qt was built before building the test.
That's a cute hack, but it's a bad idea: it breaks the vcproj
generator to process the same subdir multiple times, and it also
gives the very unintuitive result that doing `make clean' under
tests/auto cleans out a part of the Qt build!
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace
Fixed compile of these tests when Qt is configured with -qtnamespace
Check in sample license headers
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QLocalSocket::isValid on Windows must check for broken connection
fix pipe handle leak in qlocalsocket_win.cpp
GraphicsViewBenchmark: Run app in full screen mode on small desktops.
Fix Thai text on Windows 7
Fix License headers.
QTextCodec::codecForName. Insert in the cache in all cases.
Prevented calling the pixmap filter implementations with null pixmaps.
Make it possible to run benchmarks with the "-graphicssystem" switch.
Add support for running the GraphicsViewBenchmark application manually.
Bump version to 4.6.3.
Fixed a GLX warning that occured with some Intel chipsets under X11.
Fixed compile for maemo6.
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
...
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Reviewed-By: Trond
Autotest: tst_QGL::qglContextDefaultBindTexture
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
delivered queued.
Since we emit the signal while the locks are in place, we have to have
queued delivery.
Task-number: QT-760
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
New behavioral checks for an invalid QScriptString and for not a number
QScriptString.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QGraphicsItem
After propagating QEvent::TouchBegin, if there is no item that has
accepted and handled the event, we must remove the touch point from our
data structures.
In this situation, QGraphicsScene will ignore the TouchBegin, as will
QGraphicsView, and QApplication will respond by not sending any more
touch events to the view/scene/item. This means our logic for handling
TouchPointReleased points will never be called (and the QGraphicsScene's
itemForTouchPointId and sceneCurrentTouchPoints state will be
incorrect).
Reviewed-by: Denis Dzyubenko
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Events should not propagate outside the panel. Also when delivering gesture
events we should respect panels modality.
Task-number: QTBUG-7451
Reviewed-by: Mikko Harju
Reviewed-by: Bradley T. Hughes
|
|\ \ |
|
| |/
| |
| |
| | |
These are not failing on MinGW.
|
|/
|
|
| |
Task: QTBUG-7997
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
Fixed drawing QPixmaps on QGLWidgets on different X11 screens.
Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.
Prevented assert when using drop shadow effect in the GL 2 engine.
Clarify QFont::rawName() docs.
Stabilize QListView test on Mac
(ODBC) Use wchar_t instead of assuming 2 bytes.
Fixed some global QIcon/QPixmap instances that leaked handles on X11.
Speed up QListView test
QListView: fix crash when hiding many of the lasts item in a QListView
Fixed warnings and crash when painting graphics effects outside scene.
Stabilize QLineEdit test on X11
(sqlite) Allow shared cache mode
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
...
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
(ODBC) Use wchar_t instead of assuming 2 bytes.
Fixed some global QIcon/QPixmap instances that leaked handles on X11.
Speed up QListView test
QListView: fix crash when hiding many of the lasts item in a QListView
Fixed warnings and crash when painting graphics effects outside scene.
Stabilize QLineEdit test on X11
(sqlite) Allow shared cache mode
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Fixed bug where GL widget was not fully updated on Vista.
|
| | |
| | |
| | |
| | | |
(from 31s to 7s)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since 6c1388ee5a3c4796d hidden items are not taken in account when
counting the scrollbar position, and so the vector may be smaller.
Reviewed-by: Gabriel
Task-number: QTBUG-7929
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This modification is needed to allow performance optimisations
necessary for QML.
Reviewed-by: Warwick Allison
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Only the compiled in formats where checked when
setAutoDetectImageFormat(false) was set on a QImageReader object.
Task-number: QTBUG-7980
Reviewed-by: aavit
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Restore Qt 4.5 behaviour.
Task-number: QTBUG-7395
Reviewed-by: Thierry
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The DataStore could have been destroyed before.
Even if having static QGraphicsItem is not really supported, it is
better not to crash
Task-number: QTBUG-7629
Reviewed-by: bnilsen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QTextCodec::codecForName and codedForMib were not reentrant
Reviewed-by: Brad
Reviewed-by: Denis
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Apply newly generated test values.
Add new test values to QScriptValue test generator.
Fix an unhandled exception in QScriptValue's test generator.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 36fe058a9001e6d47f0fd41c6304cdfdf3a735ed )
Cannot drag actions in Designer on Mac OS X/Cocoa.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Apply test results for values created directly from QScriptEngine
(results of nullValue() and undefinedValue())
Reviewed-by: Kent Hansen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Two new values were added; results from QScriptEngine::nullValue() and
QScriptEngine::undefinedValue().
Reviewed-by: Kent Hansen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
$QT_END_LICENSE was interpreted as a template key by Template() object,
causing substitute() call to throw a KeyError exception.
The bug was introduced in 9962e2d96a212c518054220167eb6f61e1052bcc.
Reviewed-by: TrustMe
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add the download URI for smart installer package to documentation
Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
rename trk -> symbianutils
Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
Fixed defect in handling of expose events for Symbian
Added qwidget test case which displays a native child widget
Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
As of commit bc82db, show()ing a native child widget causes a panic
on Symbian. The panic code (WSERV-10) indicates that Activate() is
being called on an already-active graphics context.
This test case reproduces the defect.
Task-number: QTBUG-7960
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
We should consider the difference between Point and Pixel for font size. And also the margin and some other settings in style for views.
Reviewed-by: TrustMe
|
| | | | |
|
| | | | |
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
The function fails on Mac and Windows, but it will be fixed in next JSC
update. Lets skip it for now.
Reviewed-by: Kent Hansen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixed a bad merge in the QAbstractSlider::wheelEvent.
Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.
Reviewed-by: Richard Moe Gustavsen
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Use "make check" to run all the auto-tests.
Task-number: QTPROD-442
Reviewed-by: Harald Fernengel
Reviewed-by: Rohan McGovern
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed casual crash in initializeDb (Symbian)
Fixed a bug where text would disappear in password fields.
Fixed sendEvent call.
Removed useless member variable and replaced with var on the stack.
Fixed indentation.
Fix to S60 softkey pressed down image.
Whitespace/tab fixes.
s60 application loses normalGeometry when returning from fullscreen
Fixing 'softvfp+vfpv2' compiling issue for Tb9.2
|
| |
| |
| |
| | |
Reviewed-by: Trust me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem description: normalGeomerty lost during showFullScreen
1. Reported problen was due on void QSymbianControl::PositionChanged()
over write top->normaGeometry on every position change. As fix
top->normalGeometry is moved to new rect:s top left only when
widget windowState == 0.
2. Also made some new qwidget auto tests. Refactored s60 side
setWindowState to be more readable. Minimized window state now
hides window decoration.
QApplication & QWidget autotest run on emulator and tested on
s60 5.0 hw using attached application.
http://bugreports.qt.nokia.com/browse/QTBUG-6231
Task-number:QTBUG-6231
Merge-request: 2256
Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7037
Reviewed-by: Kim
|
| |
| |
| |
| |
| |
| |
| | |
When creating a custom QContextMenuEvent to send to a viewport we should use
the viewport to convert the mouse cursor position to screen coordinates.
Reviewed-by: Olivier Goffart
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
Compiler warning in QAbstractSlider.
Optimize QPathClipper::pathToRect.
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
Proper Fav icon is not shown, for all the links default fav icon shown
Update changes-4.6.2.
...
|