summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Clean up properly in the QPF1 font enginePaul Olav Tvete2009-09-111-0/+6
| | | | | | | We have to munmap() what we have mmap()ed Reviewed-by: Gunnar Reviewed-by: Jeremy
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-114-33/+57
|\
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-111-1/+2
| |\
| | * QLocalSocket (Win) emit readChannelFinished only onceJoerg Bornemann2009-09-111-1/+2
| | | | | | | | | | | | | | | | | | | | | If pipeClosed is true, then we've already emitted the readChannelFinished signal. We must not do this in close() in that case. Reviewed-by: ossi
| * | Changed Symbian tests to sleep only when run on emulator.Miikka Heikkinen2009-09-111-11/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | Changed comment to be more accurate and changed ifdefs so that this will only be done for emulator. This issue needs more comprehensive analysis and wide test runs to determine what the pratical impact of removing this delay entirely would be. Task-number: 247270 Reviewed-by: Janne Anttila
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-1141-19354/+357
| |\
| | * Make mipmaps work on OpenGL/ES 2.0Rhys Weatherley2009-09-111-0/+12
| | | | | | | | | | | | Reviewed-by: Gunnar
| * | Optimized S60 version check.Miikka Heikkinen2009-09-111-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pure Symbian code to get S60 version, because if done using QDir, there will be a call back to this method, resulting doing this expensive operation twice before the cache kicks in. Pure Symbian code also makes this method ~10x faster, speeding up the application launch. Task-number: 260757 Reviewed-by: Janne Anttila
* | | Fixed QWidget::setWindowState for Symbian.Janne Anttila2009-09-111-16/+27
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit calling setWindowState(Qt::WindowFullScreen) on a widget instance affected all new widget instances created after this method. This bug happened due to fact that window decorations i.e. statuspane and softkeys visibility was only changed when switching to or from fullscreen state. In the reported bug it happened that second widget was initially in Qt::WindowNoState and it was changed to Maximized. Since window decorations are global not window specific at the moment, the default decoration visibility for second window is the one to which previous window has set them. In this case previous window was in fullscreen and that's why the decorations were visible also for second maximized window. Probably the right fix would be to change the decoration to window specific but that is quite a big change and for now the bug is fixed with this commit. Autotest: Excluding new test case, same results before and after. Task-number: 261048 Reviewed-by: Jason Barron
* | Dump texture formats in hex, not decimalRhys Weatherley2009-09-111-2/+2
| | | | | | | | Reviewed-by: trustme
* | Recognize the OES_packed_depth_stencil extensionRhys Weatherley2009-09-111-0/+4
| | | | | | | | Reviewed-by: trustme
* | Resolve GL buffer functions in a better wayRhys Weatherley2009-09-111-6/+6
| | | | | | | | | | | | | | | | This change should make qt_resolve_buffer_extensions() handle all of the ARB, OES, and regular name variants for glBindBuffer(), etc that may occur in the wild. Reviewed-by: trustme
* | Resolve ARB_framebuffer_object and OES_framebuffer_object extensionsRhys Weatherley2009-09-102-18/+75
| | | | | | | | Reviewed-by: trustme
* | Make an EGL context current when initializing GL extensionsRhys Weatherley2009-09-103-0/+37
| | | | | | | | Reviewed-by: trustme
* | Fix the signal output in QObject::dumpObjectInfoOlivier Goffart2009-09-101-1/+1
| | | | | | | | | | | | | | | | The computation of the offset was wrong. (The offset is the difference between the method index, and the signal index) Reviewed-by: trustme
* | Fixes regression in QStyleSheet regarding QFrame:no-frameOlivier Goffart2009-09-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | In Qt know the frame is drawn in PE_Widget with stylesheet. But the QStyleOption passed by QWidgetPrivate::drawBackground is really simple and doesn't contains frame information. We need to rely on the widget itself to know if we should look for the :no-frame pseudo element. Reviewed-by: jbache Task-number: 261110
* | QLocalSocket::readData (Windows) must return -1 on EOFJoerg Bornemann2009-09-101-1/+4
| | | | | | | | | | | | | | | | If we've detected a broken pipe and we have no more data in the read buffer, then we return -1 to signal EOF. Additionally, we close the QLocalSocket. Reviewed-by: ossi
* | QLocalSocket Windows: emit readChannelFinished if broken pipe detectedJoerg Bornemann2009-09-101-0/+4
| | | | | | | | | | | | | | If we detect in a read operation that the pipe has been closed, we must emit the readChannelFinished signal. Reviewed-by: ossi
* | restoring a minimized window on Windows CE didn't workJoerg Bornemann2009-09-102-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring a minimized window we only saw the window decoration. All content was missing. That's because we don't get a WM_SIZE message for restoring the window. We must react on WM_ACTIVATE in this case. This fixes the issue for Windows mobile too. Task-number: 260702 Reviewed-by: thartman Conflicts: src/gui/kernel/qguifunctions_wince.cpp
* | S60 font db more tolerant of failuremread2009-09-101-1/+6
| | | | | | | | | | | | | | This now loads the fonts it can and asserts that at least one is loaded, rather than requiring all fonts to load. Reviewed-by: Alessandro Portale
* | QTextDocument::contentsChanged() was emitted twice for a singlemae2009-09-101-1/+1
| | | | | | | | | | | | | | | | insertion. This was caught by the QSyntaxHighlighter autotest. Reviewed-by: Paul
* | Fix compilation with winscwSimon Hausmann2009-09-104-18/+18
| | | | | | | | | | | | | | | | Winscw gets very confused when the name of an enum value is the same as the name of an entire namespace, JSC in this case. Renaming the enum value to JavaScriptCore fixes this. Rubber-stamped-by: Kent
* | Re-order begin() so everything needing a current context has oneTom Cooksey2009-09-102-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | It should be up to QGLPaintDevice::beginPaint() to make the correct context current, so everything needing a current context needs to be moved after that call. This patch also modifies QGLPixmapData to use QGLContext::drawTexture rather than the GL2 PE's drawTexture, which shouldn't be called inside beginPaint as the paint engine hasn't been fully initialised yet. Reviewed-by: Eskil
* | Doc: Documented the standard keys in item views.Geir Vattekar2009-09-101-1/+39
| | | | | | | | | | Task-number: 212278 Reviewed-by: David Boddie
* | Fixed rendering of text with gradient pen in GL 2 engine.Samuel Rødal2009-09-101-5/+4
| | | | | | | | | | | | | | | | | | We should bind the text mask texture after calling prepareForDraw(), since prepareForDraw() might need to initialize the gradient texture, which means the text mask will no longer be bound. Task-number: 261058 Reviewed-by: Kim
* | Fixed crash in raster paint engine.Samuel Rødal2009-09-101-1/+1
| | | | | | | | | | | | | | If m_element_types is empty then we should create a QVectorPath without element types as well. Reviewed-by: Gunnar
* | Wrong opacity set on the painter in QGraphicsEffect::draw.Bjørn Erik Nilsen2009-09-101-0/+1
| | | | | | | | | | | | | | | | We have to initialize the painter with the 'effected' item's opacity before calling QGraphicsEffect::draw; otherwise we'll use the previous rendered item's opacity (which is wrong). Reviewed-by: Michael Brasser
* | Fixed white-space handling in the SVG module.Kim Motoyoshi Kalland2009-09-101-10/+13
| | | | | | | | | | | | | | | | | | When parsing lists, only space characters were treated as white-space. Now, carrige returns, line feeds and tabs are also treated as white- space as described in the SVG Tiny 1.2 specification. Task-number: 260799 Reviewed-by: Tor Arne
* | Made raster respect SmoothPixmapTransform and Antialiasing hints better.Samuel Rødal2009-09-101-14/+5
| | | | | | | | | | | | | | | | SmoothPixmapTransform shouldn't imply Antialiasing for image / pixmap drawing, since the render hints are fully orthogonal. Task-number: 256967 Reviewed-by: Trond
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-09-105-3/+18
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-101-1/+1
| |\ \
| * | | Enable Qt3Support for Qt/Cocoa on Mac OS X.Morten Sorvig2009-09-105-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt on Mac OS X should not be the only desktop platform without Qt3Support once the Carpon port is dropped. This will also make the switch from Carbon to Cocoa-based Qt as smooth as possible. This is a minimal port, with some code removed: Q3FileDialog is gone. Q3MainWindow won't get the "hide toolbar" button. Q3ScrollView might to more updates than structly neccesary. The rest is there, including the QT3_SUPPORT functions in QtCore and QtGui.
* | | | Remove (out-of-date) DEF files for Symbian winscw build.Iain2009-09-109-19218/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | These hadn't been updated since they were frozen against Tower (or a build close to the one used for Tower) so they're out of date and therefore useless. They'll reappear when we have a DEF file strategy. RevBy: Jason Barron
* | | Fix focus policy propagation in QCompleter on QWSPaul Olav Tvete2009-09-101-1/+1
|/ / | | | | | | | | | | | | setParent(0) can change the focus policy, so let's retrieve the original value a bit earlier. Reviewed-by: jasplin
* | Upload texturedata in matching internal format..Gunnar Sletta2009-09-101-12/+26
| | | | | | | | Reviewed-by: Tom
* | Don't yinvert pixmaps on eglx11Gunnar Sletta2009-09-101-3/+0
| | | | | | | | Reviewed-by: Tom
* | Fix random selection when the order is descending.Alexis Menard2009-09-102-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fix the random selection that appear when the sort is not ascending. The problem is that sometimes the sort is not yet made (timer is not yet fired) so the visible children list contains both sorted items and non sorted items (at the end). translateVisibleLocation was buggy assuming that the list is always sorted. We have now a dirty index that indicate where the dirty items start. And then when the sort is made the dirty index is reset. I have added auto-test for that and fix one that was broken for Mac. The new version of the auto-test showed a crash because of this broken selection. Task-number:258751 Reviewed-by:thierry
* | Fix crash in gl2 paint engine on WindowsEskil Abrahamsen Blomfeldt2009-09-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | wglGetProcAddress() on Windows requires a current context. Since there was none, the resolution of GL extensions would silently fail, the function pointers would be null and when we tried to use them later we would get a crash (e.g. in startup of PadNavigator.) I've added an assert to make the cause of the crash clearer, and a makeCurrent() to fix the crash. Reviewed-by: Tom
* | Fixed handling of stop-color="currentColor" in the SVG module.Kim Motoyoshi Kalland2009-09-102-14/+31
|/ | | | | | | The 'color' attribute is now explicitly parsed for gradient nodes. Task-number: 260921 Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-103414-14631/+15227
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-2/+7
| |\
| | * Fixed crash on shutdown with GL when leaking QGLWidgetsGunnar Sletta2009-09-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | The problem was the QGLContextResource destructor which was called when the QtOpenGL dll was unloaded. At this point in time, the gl driver had already been unloaded so any gl calls at this point in time would crash. It is simply wrong for the destructor to try to clean up, so we instead output a warning if resources are leaked.
| * | Return the correct QGLFormat to the OpenGL1 paint engine for FBO'sRhys Weatherley2009-09-103-4/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | QGLPaintDevice::format() was returning the context's format, not the format of the window surface's FBO. This caused the OpenGL1 paint engine to think that the window didn't have depth and stencil buffers, even though the FBO most certainly did. This change makes QGLPaintDevice::format() virtual and overrides it in QGLFBOGLPaintDevice to return an updated format that includes the context parameters plus the extra features that the FBO supports. Reviewed-by: Tom Cooksey
| * Fix a bug with mouse events in DirectFBAnders Bakken2009-09-101-0/+14
| | | | | | | | | | | | | | | | Partially revert a974ce81d6324d8d85ade0153b5ce7c757ba4fdf. It seems odd to just ignore the actual data in the input event but when the layer and the event differs the layer is correct. Reviewed-by: TrustMe
| * DWDESC_OPTIONS was added for DirectFB 1.1Anders Bakken2009-09-101-1/+4
| | | | | | | | Reviewed-by: TrustMe
| * s/DIRECTFB_MINOR_VERION/DIRECTFB_MINOR_VERSION/Anders Bakken2009-09-101-1/+1
| | | | | | | | | | | | This will make DirectFB version tests work. Reviewed-by: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-101-1/+1
| |\
| | * Use fromLatin1() in QDirectFBScreen::connect()Anders Bakken2009-09-091-1/+1
| | | | | | | | | | | | | | | | | | Avoid warning when building DirectFB as part of Qt. Reviewed-by: TrustMe
| * | Fix font glyph handling for QPF fonts in the OpenGL1 paint engine.Rhys Weatherley2009-09-101-1/+18
| |/ | | | | | | | | | | | | | | | | Text drawing on OpenGL/ES 1.1 systems using QPF was displaying filled boxes in place of the character glyphs. This is due to the QPF implementation of alphaMapForGlyph() returning a different color table than that expected by QGLGlyphCache::cacheGlyphs(). Reviewed-by: Sarah Smith
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-094-12/+70
| |\