summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docWarwick Allison2009-10-202-25/+115
| | | | | QT-2324 QT-2306
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-192-11/+24
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * modifications to searchbox exampleYann Bodson2009-10-192-11/+24
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-1987-1469/+1936
|\ \ | |/ |/| | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * fix widget activation from minimized state on Windows mobileJoerg Bornemann2009-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The following didn't work on Windows mobile: * show a widget normal (non-maximized) * minimize it * reactivate it via the file explorer * now the widget should be visible again The code path from minimized to normal state was missing. Reviewed-by: thartman
| * fix bug in tst_qwidget.cppJoerg Bornemann2009-10-191-4/+6
| | | | | | | | | | | | WinIdChangeEventWidget::event didn't return a value in all codepaths. Reviewed-by: thartman
| * qwidget_wince.cpp: don't invalidate the crect on maximizeJoerg Bornemann2009-10-191-14/+4
| | | | | | | | | | | | | | If we do this, QWidget::width() returns negative sizes, which makes QGraphicsView crash. Reviewed-by: thartman
| * qwindowsmobilestyle.cpp: endif comment fixedJoerg Bornemann2009-10-191-1/+1
| |
| * QTestLib: do not assert if testLogger object is already destroyedPeter Hartmann2009-10-191-2/+2
| | | | | | | | | | | | | | | | ... because when dumping signals we might get QThread::finished() etc. when closing the program, and then the testLogger instance might already be deleted. Reviewed-by: Jesper
| * Reimplementing QDate/QTime/QDateTime in Symbian native mannerAleksandar Sasha Babic2009-10-191-1/+61
| | | | | | | | | | | | | | Some of the methods used in QDate/QTime/QDateTime have been reimplemented to use native Symbian calls. Reviewed-by: Janne Anttila
| * Fix doc error.Jason Barron2009-10-191-1/+1
| | | | | | | | | | | | Should *not* be used as a softkey. Reviewed-by: TrustMe
| * Fixed the build for people who only have emulator binaries installedaxis2009-10-191-1/+1
| | | | | | | | RevBy: mread
| * Fluidlauncher now comes to foreground when child application dies.Miikka Heikkinen2009-10-191-0/+4
| | | | | | | | | | Task-number: QT-2162 Reviewed-by: axis
| * Fixed QWidget::raise in SymbianMiikka Heikkinen2009-10-191-1/+6
| | | | | | | | | | | | | | | | If toplevel window is raised, the whole application is now raised to foreground. Task-number: QT-2162 Reviewed-by: axis
| * setcepaths: add support for wincewm65professional-msvc200? mkspecsJoerg Bornemann2009-10-191-0/+10
| | | | | | | | Reviewed-by: mauricek
| * QTestLib: do not assert if file is not given in logging functionPeter Hartmann2009-10-191-1/+0
| | | | | | | | | | | | | | that assert was triggered when running a test with "-vs" to show all the signals emitted. Reviewed-by: Andy Shaw
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-19256-5633/+5909
| |\
| | * qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-195-17/+56
| | | | | | | | | | | | | | | | | | It works just like the \qmlproperty command, except that it puts the properties in a different section for attached properties.
| | * Regression fix. Fix the hasUncaughtException() flag in debugger's event.Jedrzej Nowacki2009-10-195-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QScriptEngine::hasUncaughtException() flag should be set to true if returning from a JS function was caused by an exception. According to documentation, the flag had to be accessible from the QScriptEngineAgent::functionExit event. New autotest was added. Reviewed-by: Kent Hansen
| | * Fix crash in QPixmapCache.David Faure2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | QCache destruction accesses the key array that was freed in the QPixmapCache destruction, so better clear() before deleting that key. Merge-request: 1820 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| | * QSslSocket: Also handle setSocketOptionMarkus Goetz2009-10-193-0/+33
| | | | | | | | | | | | | | | | | | | | | Handle setSocketOption and forward it to the plainSocket that QSslSocket is using internally. Reviewed-by: Thiago
| | * Made sure the noSocketEvents value is preserved in case of exception.axis2009-10-191-3/+3
| | | | | | | | | | | | | | | Task: QT-987 RevBy: mread
| | * 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 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