summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make the raster graphics system default on Mac.Morten Johan Sørvig2009-10-201-0/+8
| | | | | | The plan is to make this default for Cocoa on Qt 4.7. Switching it over now will give us time to find regressions. Use "-graphicssystem native" to escape back to CoreGraphics.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-10-193-12/+51
|\
| * Merge branch '4.6'Thiago Macieira2009-10-1959-1402/+1634
| |\
| | * Made Mac Carbon use the input method hints when deciding on IM.axis2009-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
| | * Fix autotest case for QSoftkeyManagerSami Merilä2009-10-191-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSoftkeyManager's test case checkSoftkeyEnableStates was broken with recent fix to QSoftkeyManager where softkey action is no longer initialized to the initial state of action widget. Instead, softkey action checks the state of action widget when handling the action. Autotest case is now fixed to handle the change. Task-number: N/A Reviewed-by: Miikka Heikkinen
| | * Remove debug output.Morten Johan Sørvig2009-10-191-1/+0
| | |
* | | Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-10-1956-1390/+1583
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-191-0/+25
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-191-1/+1
| | |\
| | * | Additional documentation added to deployment.qdoc which lists the process ↵Peter Yard2009-10-191-0/+25
| | | | | | | | | | | | | | | | and links to the original MSDN pages which describe it in full.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-19433-33829/+43712
| |\ \ \ | | | |/ | | |/|
| | * | ODBC: Retrieved in ascii, should be stored in ascii.Bill King2009-10-191-1/+1
| | |/ | | | | | | | | | | | | | | | For non-unicode databases, use ascii. Task-number: QTBUG-3736
| * | Fixed crash in the Boxes demo when using -graphicssystem opengl.Kim Motoyoshi Kalland2009-10-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWindowSurface::flush() assumed that updateGeometry() had been called, but in some cases it hadn't. It would therefore dereference a null pointer and crash. This has been fixed by returning from flush() if updateGeometry() has not been called. This fixes the symptom rather than the bug, so we still need to find out why it hasn't been called. Reviewed-by: Trond
| * | This reverts commit 99739f35bf700a2bff707da99f5043cd7c12aed5.Kim Motoyoshi Kalland2009-10-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create native windows when setting the window title, delay the creation until the native window is needed. If a user really needs the window to be created, he/she can call winId() on the widget or set Qt::AA_ImmediateWidgetCreation. Reviewed-by: Bradley T. Hughes
| * | Fixed a crash in tst_qpainter on SPARC w/gcc.Trond Kjernåsen2009-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This test works with the native Sun compiler for some reason, and the problem is an unaligned read of 16 bits, which is a problem on several other architectures. Reviewed-by: Kim
| * | Fixed a crash in the tst_qgl test.Trond Kjernåsen2009-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | QGLFramebuffer::isBound() would crash if it was called when there wasn't a current context bound. Reviewed-by: Kim
| * | Optimized QPixmap::fill for GL backend when pixmap is used as is.Samuel Rødal2009-10-152-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLPixmapData is bound after a fill(), without being painted on in the mean-time, it's cheaper to directly generate a source image than to go through convertToGLFormat(), since all the pixels in the image will have the same value. Reviewed-by: Trond
| * | Fixed tst_QPixmap test failures with GL pixmap backend.Samuel Rødal2009-10-151-0/+4
| | | | | | | | | | | | | | | | | | Fixes test failures in fill() and setGetMask(). Reviewed-by: Trond
| * | Fixed QPainter::begin() so that it fails gracefully.Kim Motoyoshi Kalland2009-10-153-29/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed QPainter::begin() so that if it fails, it can still be used on other paint devices without causing an assert. Autotest included. I also made begin() fail on images with the QImage::Format_Indexed8 format and added warnings in the documentation since painting on such images is not supported. Reviewed-by: Trond
| * | Added explicit qualification of static functions to fix xlC compilation.Samuel Rødal2009-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It seems static inline functions need to be fully qualified when called from inside a template function. Task-number: QTBUG-3368 Reviewed-by: Gunnar Sletta
| * | Optimized raster drop shadow filter to only blur alpha channel.Samuel Rødal2009-10-151-24/+27
| | | | | | | | | | | | Reviewed-by: Gunnar
| * | Fixed buggy bitmap drawing in GL 2 engine on X11.Samuel Rødal2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | Don't use texture_from_pixmap extension for QBitmaps. Reviewed-by: Tom
| * | Fixed bitmap brushes and tiled bitmaps in the OpenGL1 paint engine.Kim Motoyoshi Kalland2009-10-153-92/+132
| | | | | | | | | | | | | | | | | | | | | Fixed drawing of bitmap brushes and tiled bitmaps so that they are painted with the brush colour or pen colour instead of black. Reviewed-by: Trond
| * | CompileEskil Abrahamsen Blomfeldt2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | There's no implicit conversion from QPixmap to QImage Reviewed-by: Gunnar
| * | Fixed the GLSL-to-assembly code generator to output enums correctly.Kim Motoyoshi Kalland2009-10-141-21/+32
| | | | | | | | | | | | | | | | | | | | | | | | Fixed the output of enums such that the last item in the enum is not followed by comma. Changed the output of the license to say that the file is part of the QtOpenGL module, not the test suite. Reviewed-by: Trond
| * | Cleaned up OpenGL1 paint engine GLSL code.Kim Motoyoshi Kalland2009-10-1420-1063/+1009
| | | | | | | | | | | | | | | | | | | | | Fixed warnings about int->float and float->vecN conversions. Removed unused shader files. Reviewed-by: Trond
| * | Optimized bloom graphics effect implementation.Samuel Rødal2009-10-141-9/+13
| | | | | | | | | | | | | | | | | | | | | Avoid doing so many conversions by operating on raster pixmaps, and by using INV_PREMUL/PREMUL instead of converting to ARGB32. Reviewed-by: Gunnar Sletta
| * | Added qt_toRasterPixmap functions.Samuel Rødal2009-10-141-0/+23
| | | | | | | | | | | | | | | | | | | | | Similar to the existing qt_toX11Pixmap, this lets us explicitly create pixmaps with the raster pixmap backend. Reviewed-by: Gunnar Sletta
| * | Added QPixmapData::createCompatiblePixmapData() used by QPixmap::copy().Samuel Rødal2009-10-1413-8/+52
| | | | | | | | | | | | | | | | | | QPixmap::copy() now returns a pixmap with the same pixmap backend. Reviewed-by: Gunnar Sletta
| * | Fixed wrong use of graphics effects for pixmap graphics items.Samuel Rødal2009-10-141-27/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blur, drop shadow, and bloom graphics effects are scale dependent, since they have radius and offset (in the case of drop shadow) parameters that are specified in device coordinates. Thus, we can't apply the effect in logical coordinates and scale up, and need to always use the device coordinate path for these effects. The opacity and grayscale effects still use the logical coordinate optimization. Reviewed-by: Gunnar Sletta
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-146-17/+16
| |\ \
| | * | Fixed upside down brush patterns in the OpenGL paint engines.Kim Motoyoshi Kalland2009-10-142-3/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2222 Reviewed-by: Gunnar
| | * | Fixed handling of brush origin in the OpenGL paint engines.Kim Motoyoshi Kalland2009-10-133-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the OpenGL paint engines so that the brush origin is applied correctly and for all brushes just like in the raster paint engine. Task-number: QTBUG-2676 Reviewed-by: Trond
| | * | Fixed bug where bitmaps were painted black instead of in pen colour.Kim Motoyoshi Kalland2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | penData and the pen painter state were not in sync when drawing bitmaps in the raster paint engine. Adding calls to ensurePen() fixed the bug. Task-number: QTBUG-4210 Reviewed-by: Trond
| * | | updated fragment programs after changes to .glsl filesGunnar Sletta2009-10-141-141/+105
| | | |
| * | | Make QStrokerOps, QStroker and QDashStroker properly modulargunnar2009-10-131-4/+4
| | | |
| * | | Make QStrokerOps, QStroker and QDashStroker properly modulargunnar2009-10-132-8/+38
| |/ /
| * | Work around broken ATI X1600 drivers on Mac OS XGunnar Sletta2009-10-131-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | The GLSL implementation messes up return values from functions so that all our srcPixel()'s become black and several matrices are off. We don't want to rewrite the shader code to fit an "ancient" graphics card, so we simply fall back to the GL 1 engine. Reviewed-by: Trond
| * | Fixed bug when using QGLWidgets in -graphicssystem openglSamuel Rødal2009-10-122-1/+18
| | | | | | | | | | | | | | | | | | We need to make sure that the FBO is bound in a valid context. Reviewed-by: Tom
| * | Fixed documentation of QPixmap::x11Info() to not talk about widgets.Samuel Rødal2009-10-121-5/+5
| | | | | | | | | | | | Reviewed-by: Trond
| * | Fixed bug on X11 with WA_TranslucentBackground and native child widgets.Samuel Rødal2009-10-121-25/+46
| | | | | | | | | | | | | | | | | | | | | The native child widgets need to inherit the parent's visual in order to have a translucent background as well. Reviewed-by: Trond
| * | Fixed bug where calling fill on pixmap with active painter would crash.Kim Motoyoshi Kalland2009-10-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QPixmap::fill() on a pixmap may in some cases cause the painter's paint engine pointer to become stale. A subsequent call to the painter would therefore crash. Now, QPixmap::fill() will print a warning and return in those cases. I also added a warning in the documentation of QPixmap::fill(). Task-number: QTBUG-2832 Reviewed-by: Trond
* | | Merge branch '4.6'Thiago Macieira2009-10-16306-31640/+39893
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: translations/assistant_adp_pl.ts translations/assistant_adp_ru.ts
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-10-161-1/+6
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/egl/qegl_symbian.cpp
| | * | QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | | | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
| | * | Recognize transformed screens when looking for a QGLScreenRhys Weatherley2009-10-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QWS_DISPLAY is specified as "Transformed:powervr:...", then we will encounter QScreen::TransformedClass rather than QScreen::ProxyClass when searching for the QGLScreen. This change makes the code search for both. Task-number: QT-2261 Reviewed-by: Sarah Smith Back port of 8e4fa6e87f74cfb3457e8270a361cf30ca7d3593
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-10-163-346/+69
| |\ \ \
| | * | | Refactored SymbianSubdirsMetaMakefileGenerator out of qmake.Miikka Heikkinen2009-10-163-346/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no need to have SymbianSubdirsMetaMakefileGenerator in cross-platform metamakefile.cpp, so moved the Symbian specific functionality to symmake.cpp as suggested by qmake reviewers. Task-number: QT-822 Reviewed-by: Janne Anttila
| * | | | Doc: Documentation for gesture features. Still a moving target.David Boddie2009-10-1615-26/+1246
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Doc: Moving the Image Gestures example.David Boddie2009-10-167-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-15 23:45:37 (GMT)