| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: QtWebkit and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
|
|
|
|
| |
Reviewed-by: Harald Fernengel
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable preserved swap behavior when surface is created due to resize.
Generate triggered signal even the action launches menu in Symbian.
Symbian emulator: unload file server so apps can be recompiled.
Clear QFontCache TLS content before nullifying TLS pointer.
Fixed focus and window activation events on Symbian when opening menu.
QTBUG-4887 and other exception safety fixes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change includes a fix for QTBUG-4887 and other exception safety
problems found while testing it.
The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on
failure like a proper class should, instead it tries to fail "nice".
What happens here is that setAlphaChannel would crash on OOM as after
the convertToFormat call, d could be NULL. This new version checks the
result of the conversion before using it.
The other fixes are all cases where exceptions were thrown from
destructors. I added code to the test app to help debug these cases,
and I fixed all the problems I found.
With these changes, tst_exceptionsafety_objects runs and passes on the
Symbian emulator.
Reviewed-by: Shane Kearns
|
|/
|
|
| |
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
| |
Do not explicitly create instances of QS60PixmapData in this function
because it is possible that we are using another graphics system. The
fromNativeType() function is virtual so the graphics system will create
the right version of the pixmap data for us and ensure that we get into
the right implementation.
Reviewed-by: Aleksandar Sasha Babic
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make tablet detection work with new wacom drivers
Fixed an exit crash that could occur in the GL 2 engine under X11.
Fix tst_QVariant::operator_eq_eq(UserType)
SqlBrowser not respecting casings.
Remove vgClearPath() change to OpenVG paint engine
QVariant: Fix crash when comparing two variant with the same undefined type.
Fix compositing when QWS background is completely transparent.
Fixes wrong composition mode for cached backgrounds in Graphics View.
Support keypad input with vnc driver
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The global destructor for the clean up hooks might be called before the
global destructor for QPixmap objects. We shouldn't leave pixmaps
around that is destroyed after the QApplication destructor is called.
Task-number: QTBUG-8681
Reviewed-by: Tom Cooksey
|
|/
|
|
|
|
|
|
|
|
|
|
| |
We do not officially support static loading of icons.
In fact they still crash for simple png cases due to missing
X11 resources. But since we lazily create themed icons
we can certainly avoid the crash in this case. You will
not be able to use fallbacks here though, since we cannot
know if a fallback should be used or not in this case.
Reviewed-by: ogoffart
Task-number: QTBUG-8666
|
|
|
|
|
|
|
|
| |
Don't attempt to run qt_halfScaled on images less than 2px in either
dimension. Particularly, avoid doing this from qt_blurImage, where
that situation can happen as a result of a clipped QGraphicsEffect.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
| |
Change 8721d060a67a01ac891cab9d3d17aacf7373bcf0 broke the previous
fix.
Task-number: QTBUG-8606
Reviewed-by: Gunnar
|
|
|
|
|
|
|
| |
Grabbing layered windows doesn't work on Vista and above, so instead we
need to grab the corresponding area of the desktop widget.
Reviewed-by: Samuel
|
|
|
|
|
|
|
|
| |
Don't assume format is the same as systemFormat() in the QNativeImage
constructor, for translucent windows it's always ARGB32_Premultiplied,
and the depth of the window is always 32 bit.
Reviewed-by: Trond
|
|
|
|
|
| |
Reviewed-By: Trond
Autotest: tst_QGL::qglContextDefaultBindTexture
|
|\ |
|
| |
| |
| |
| |
| |
| | |
The GL 2 pixmap filter uses Indexed8 images in the drop shadow case.
Reviewed-by: Tom Cooksey
|
|/
|
|
| |
Reviewed-by: Kim
|
|
|
|
|
|
|
|
| |
Never ever create global cache objects that deletes QPixmaps when
destructed!
Task-number: QTBUG-8046
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that when an item had a QGraphicsEffect on itself and
that item was outside of the sceneRect, the cached pixmap of the item
was just an empty pixmap (when using DeviceCoordinates mode). Therefore
the effect filter was trying to paint into an unformatted and empty
image. Now, paint() for all pixmap filters just return immediatly when
the pixmap is empty.
Task-number: QTBUG-5358
Reviewed-by: sroedal
|
|
|
|
|
|
|
|
| |
Only the compiled in formats where checked when
setAutoDetectImageFormat(false) was set on a QImageReader object.
Task-number: QTBUG-7980
Reviewed-by: aavit
|
|
|
|
|
|
|
|
|
| |
Destroying QPixmaps after the QApp destructor will leak native pixmap
objects on X11, and it's a general rule that all GUI objects must
be destroyed before the QApp destuctor is called.
Task-number: QTBUG-7746
Reviewed-by: Kim
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes quite a lot of issues:
* QtOpenGL only registered qpixmap destruction hooks on X11 and
those only cleanup the EGL/GLX surface, not the texture object.
* The QPixmap destruction hooks were only being called from the
QPixmap destructor. However, this means when a QPixmap is assigned
to another QPixmap, the hooks don't get called.
Task-number: QTBUG-7647
Reviewed-By: Samuel
Reviewed-By: Trond
|
|
|
|
|
| |
Task-number: QTBUG-7530
Reviewed-by: Kim
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
This comes from the dark ages of Qt 3.x, where QImage was an
explicitly shared class.
Task-number: QTBUG-7231
Reviewed-by: Kim
|
| |
| |
| |
| |
| |
| |
| |
| | |
This test is meant to check whether the grayscale operation is done
in-place or not.
Task-number: QTBUG-6901
Reviewed-by: Bjørn Erik Nilsen
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
|/ / / /
| | | |
| | | |
| | | |
| | | | |
Task: http://bugreports.qt.nokia.com/browse/QTBUG-7468
Reviewed-by: Trond
|
| |_|/
|/| |
| | |
| | |
| | | |
Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303
Reviewed-by: Samuel
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-7161
Reviewed-by: Daniel Pope
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
QBoxLayout::setGeometry would not respect the widget min/max width
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
Use QFile:rename when moving items in QFileystemModel.
Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
Fix default filter selection when using HideNameFilterDetails option.
Don't write out fo:word-spacing if its the default value.
Improved initial startup time for a QGLWidget ontop of EGL/X11.
Document the QGraphicsView::IndirectPainting flag
Display broken symlinks in the filesystem model.
Fix typo in autotest testcase name.
Fixed a bug with distribution of spans.
Make unit test more robust
Compile with QT_NO_DOCKWIDGET
Removed temporary QGLWidget created during QGLWidget/X11 initialization.
Fix test: The bug is now fixed
Fix auto-test failure on Windows
QScript: Lookup the native setter from the prototype
Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
fix compilation in GL2 paint engine for Windows
Move QGLTextureGlyphCache into it's own file
...
|
| |
| |
| |
| |
| |
| |
| | |
QX11PixmapData::transformed initializes a new QX11PixmapData object but
doesn't set its serial number.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|/
|
|
| |
Task-number: QTBUG-7118
|
|
|
|
|
|
|
|
| |
Calling metric() to get the device height in mm of a pixmap when using
the raster engine would actually return the width..
Task-number: QTBUG-6985
Reviewed-by: Carlos Duclos
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
|
| |
| |
| |
| | |
Reviewed-by: Holger Hans Peter Freyther <zecke@selfish.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The gif and mng reader will return -1 as QImageReader::loopCount()
for infinite images. Document that this -1 is clashing with the
error handling of this method.
The documentation was mixing the default and error cases. In some
cases "Otherwise -1" and "Otherwise 0" was used. Change this to
mention the default coming from QImageIOHandler in the "Otherwise"
clause and document the error case with -1.
Add a test case to check that loopCount() returns -1 for infinite
animations.
Reviewed-by: Andreas
|
| |
| |
| |
| | |
Reviewed-by: Andreas
|
| |
| |
| |
| |
| |
| |
| |
| | |
Deploy the same idiom found in QIODevice::errorString(). Return
"Unknown Error" in case of am empty string. This is a tiny improvement
for QtWebKit.
Reviewed-by: Andreas
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
tests/benchmarks/benchmarks.pro
|
| |
| |
| |
| |
| |
| |
| |
| | |
PBM files are MSB, not LSB - the pbm reader was correct,
but not the pbm writer.
Task-number: QTBUG-6937
Reviewed-by: Sarah Smith
|
| |
| |
| |
| |
| |
| | |
Cherry-picked from d8a2e52e
Merge-request: 419
Reviewed-by: Olivier
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
We need to clear the QPixmap before the image is drawn using the
CGContextDrawImage().
Reviewed-by: Norwegian Rock Cat
|
| |
| |
| |
| |
| |
| |
| | |
armcc has issues with templated static inline functions, have to
remove "static" keyword
Reviewed-by: sroedal
|
| |
| |
| |
| |
| |
| |
| |
| | |
This is a bad regression from 4.5. QPixmap::load() would modify all
references to the same QPixmap object.
Task-number: QTBUG-6840
Reviewed-by: Kim
|