summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace tabs with whitespace.Frans Englich2009-10-155-65/+65
| | | | | sed -i -e 's/\t/ /g' `find -name "*.cpp" -or -name "*.h" -or -name "*.pro"`
* sed -i -e 's/for(/for (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-154-5/+5
| | | | "*.pro"`
* sed -i -e 's/if(/if (/g' `find -name "*.cpp" -or -name "*.h" -or -nameFrans Englich2009-10-157-45/+45
| | | | "*.pro"`
* Use QT_NO_DEBUG, not _DEBUG.Frans Englich2009-10-154-9/+9
|
* Remove trailing whitespace.Frans Englich2009-10-157-108/+108
|
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-15367-30585/+41041
|\ | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h
| * Compile on Carbon.Morten Johan Sørvig2009-10-151-0/+4
| | | | | | | | ifdef out QCocoaPrintPanelDelegate.
| * Signal for an update when the cursor is visibleAlan Alpert2009-10-151-1/+1
| | | | | | | | | | | | | | The bug against QFxTextInput is actually due to a bug in QLineControl. Task-number: QT-2319 Reviewed-by: Martin Jones
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-153-35/+0
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-10-154-32/+10
| | |\
| | * | Remove qdocconf files for the old mac-specific source package.Jason McDonald2009-10-153-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not used for the qt-everywhere source packages, and the platform-specific source packages are no longer needed. Reviewed-by: Trust Me
| * | | qt_paint_device_metric() for fetching metricsRhys Weatherley2009-10-158-34/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Custom window surfaces, graphics systems, and Qt/Embedded screen drivers often need to access QPaintDevice::metric(), but it is protected. Hence the growing number of friends in QWidget and QImage. The qt_paint_device_metric() function provides a more future-proof approach that doesn't require lots of friends. Reviewed-by: Gunnar
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-155-69/+52
| |\ \ | | |/
| | * Change the frame rate property to a qreal from a QPair<int,int> rationalAndrew den Exter2009-10-153-68/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | While a rational number is a common way to represent a frame rate, QPair<int, int> isn't a proper numeric type meaning it can't be used as anything more than an identifer for an exact frame rate without being converted to a real, or extending it to a proper rational type. Rev by: Justin McPherson
| | * Removed assertion from QComboBox::removeItem()Stian Sandvik Thomassen2009-10-152-1/+22
| | | | | | | | | | | | | | | | | | | | | Made QComboBox::removeItem() do nothing instead of asserting if index is out of range. Reviewed-by: Andy Shaw
| * | Centralize all GL paint engine creations into qt_qgl_paint_engine()Rhys Weatherley2009-10-154-32/+10
| |/ | | | | | | | | | | | | | | | | The qt_qgl_paint_engine() function was being used by QWS, but there's no reason why it can't be used by other platforms too. This should also fix ES 2.0 paint engine support under QWS, which was stubbed out. Reviewed-by: Sarah Smith Reviewed-by: Gunnar
| * customshader won't work on OpenGL/ES 1.1 so disable for those platformsRhys Weatherley2009-10-151-1/+5
| | | | | | | | Reviewed-by: trustme
| * Update IBY file to contain all Qt modules, inc. phonon, multimedia, sqlIain2009-10-141-0/+8
| | | | | | | | Reviewed-by: Janne Koskinen
| * Cocoa: QInputDialog autotest reveals event dispatcher bugRichard Moe Gustavsen2009-10-141-8/+13
| | | | | | | | | | | | | | | | | | | | On Cocoa, we sometimes need to block sending posted events (because we need to flush the event que now and then without touching Qt events). But we forgot to do same for timer callback. So this patch makes sure that we dont send the timer event immidiatly if we are just flushing the event que. Rev-By: brad
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-10-1412-1741/+3682
| |\
| | * Update Polish translationsJarek Kobus2009-10-148-1730/+3657
| | |
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-141-10/+16
| | |\
| | | * Fix tst_QSidebar::addUrls() on Symbian.Liang QI2009-10-141-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | On Symbian, QDir::rootPath() and QDir::home() are same. RevBy: Janne Anttila
| | * | Rebuilt configure.exe.Miikka Heikkinen2009-10-141-0/+0
| | |/ | | | | | | | | | Reviewed-by: Janne Koskinen
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-144-59/+81
| | |\
| | | * Bump heap and stack size for Phonon plugins.Frans Englich2009-10-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is required by the Helix plugin. As discussed with Dallas team/Fu Liz. Reviewed-by: Shane Kearns
| | * | Synced QT_BUILD_PARTS in .qmake.cache and projects.pro for Symbian.Miikka Heikkinen2009-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations, but configure still outputted those into .qmake.cache. Fixed configure to also omit them for Symbian builds to make building demos work equally whether built by from root or not. Task-number: QT-1018 Reviewed-by: axis
| | * | Changed "Qt for S60" -> "Qt for Symbian" in configure.Miikka Heikkinen2009-10-141-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: axis
| * | | QtWebkit demos&examples compilation fix for SymbianJanne Koskinen2009-10-141-3/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
| * | doc: Replaced \obsolete with \warning.Martin Smith2009-10-143-59/+76
| |/ | | | | | | | | | | Warning: This class is provided only to get access to S60 specific functionality in the application framework classes. It is not portable. We strongly recommend against using it in new applications.
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-1414-72/+158
| |\
| | * Cocoa: qfiledialog will not exit cleanlyRichard Moe Gustavsen2009-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The native filedialog will not exit if it is told to hide. To remedy this, we just add an extra interrupt call so to inform the event dispatcher that it needs to return the the event loop to check if it has been told to quit Rev-By: olivier
| | * qdoc: Made the \sincelist command produce better html.Martin Smith2009-10-143-66/+105
| | |
| | * Fix the autotest for S60, skip tst_QPainter::drawClippedEllipse().Liang QI2009-10-141-1/+1
| | | | | | | | | | | | RevBy: Janne Anttila
| | * Fix the install targets on the new embedded demosTom Cooksey2009-10-148-4/+48
| | |
| | * Build the embedded demos on X11 so they can be used by MaemoTom Cooksey2009-10-141-1/+1
| | |
| * | Removed platform specific include from qprocess.hMiikka Heikkinen2009-10-144-11/+13
| |/ | | | | | | | | | | | | | | It wasn't necessary to have a Symbian specific include in qprocess.h, as 64-bit integer will work as pid also in Symbian. Task-number: QT-2266 Reviewed-by: Janne Anttila
| * Remove excess spam from autotests when postgresql creates primary indexes.Bill King2009-10-147-2/+40
| |
| * Improve scissor clipping in the OpenVG engineRhys Weatherley2009-10-131-0/+4
| | | | | | | | | | | | | | | | If the scissor is being used to clip instead of the mask, use the bounding rectangle of the clip path if it cannot be handled as a simple rectangle. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-132-4/+12
| |\
| | * Add further documentation to scratchbox 2 mkspecDonald Carr2009-10-131-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Documented that pkg-config functionality must be forced if used in conjunction with this mkspec, and that PKG_CONFIG_PATH is a shell variable not a qmake variable. Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
| | * Don't create too many window surfaces in DFBAnders Bakken2009-10-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Since DirectFB handles the composition for us we don't need to invalidate anything when moving a window. Only on resize do we want another paint event. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Make sure we don't repaint when moving a windowAnders Bakken2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the QDirectFBWindowSurface returns true for isBuffered(). Otherwise QWSWindowSurface will force a repaint when moved. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Explicitly request the alpha mask in the EGL configurationRhys Weatherley2009-10-131-0/+4
| |/ | | | | | | | | | | | | | | The EGL implementation used in S60/NGA for OpenVG does not return a configuration with alpha masking unless it is explicitly requested. Reviewed-by: Julian de Bhal
| * Add unsupported mkspec for scratchbox 2 targetsDonald Carr2009-10-132-0/+74
| | | | | | | | | | | | | | | | | | | | Scratchbox 2 abstracts away toolchain considerations when cross compiling, allowing us to introduce a generic scratchbox 2 mkspec. See blog for more details: http://labs.trolltech.com/blogs/2009/09/10/cross-compiling-qtx11 Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
| * 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 (cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88)
| * Add known issues wiki to docs.Jesper Thomschutz2009-10-131-0/+4
| | | | | | | | Reviewed-by: Jason McDonald
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-1354-20992/+20285
| |\
| | * Modified QSymbianControl::setFocusSafely to set last focused controlGareth Stockwell2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | to zero only if currently focused Reviewed-by: axis
| | * Mac: fix autotest for qcolordialogRichard Moe Gustavsen2009-10-131-1/+3
| | | | | | | | | | | | Rev-By: olivier
generated by cgit v0.12 at 2025-01-24 08:22:17 (GMT)