summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a typo found during translationJure Repinc2009-09-141-1/+1
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-143-2/+15
|\
| * Fix drawTiledPixmap for NPOT pixmaps on OpenGL ES 2.0Tom Cooksey2009-09-141-0/+12
| | | | | | | | | | | | | | | | | | OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead, we emulate GL_REPEAT by only taking the fractional part of the texture coords in the fragment shader. Task-number: 260982 Reviewed-by: Samuel
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-145-11/+29
| |\
| | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-141-1/+1
| | |\
| | | * Fix libiconv support on FreeBSD.Raphael Kubo da Costa2009-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason iconv support was broken in Qt 4.5 on FreeBSD, and this patch was made to fix that. Original patch by Max Brazhnikov <makc@freebsd.org>. Original message: Enable libiconv support. Didn't get where the real problem is, but using UTF-16LE/BE as default encoding (see patch) fixes the issue. Merge-request: 1480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Fixed bad gradient offsets on Mac OS XGunnar Sletta2009-09-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an engine supports pixmap transformations natively, there will still be a redirection offset in the matrix even after calling resetMatrix(), so this is not enough, we need to set it to an actual identity. Reviewed-by: Trond
* | | | Don't call into paint engines when we don't have pens and brushesGunnar Sletta2009-09-141-2/+7
| | | | | | | | | | | | | | | | Reviewed-by: sroedal
* | | | Some small optimizations to gl2 engine.Gunnar Sletta2009-09-142-30/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use qpen_ and qbrush_ accessors for slightly better performance and avoid calling for the same value again and again. Secondly, the engine doesn't use its pen and brush states so there is no point in maintaining them, so don't reset old brush all the time. Reviewed-by: Samuel
* | | | Fixed crash in gl when stroking with a Qt::NoBrush penGunnar Sletta2009-09-141-1/+3
| |/ / |/| | | | | | | | Reviewed-by: Samuel
* | | Fixed groupbox drawing on xp when hitting the fallback code.Gunnar Sletta2009-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When swapping the alphachannel we need to make sure we create proper premultiplied pixels. When setting alpha to 0, that means also setting the other pixel values to 0. This bug was made visible by the gl graphics system. Reviewed-by: MariusSO
* | | Fixed compilation of some ifdef'ed out debug messages.Gunnar Sletta2009-09-141-8/+13
| | | | | | | | | | | | Reviewed-by: trustme
* | | fix compile error debug outputGunnar Sletta2009-09-141-1/+1
| | |
* | | Autotest preventing gl from crashing on shutdown with dangling contextsGunnar Sletta2009-09-141-0/+13
|/ /
* | Performance: reduce TLS overhead of QGLContext::currentContext()Rhys Weatherley2009-09-148-64/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | The handling for the current QGLContext was looking up the same TLS data several times per call (hasLocalData() and localData() calls particularly). This change also refactors the code a little so that the setting of the QGLContext within makeCurrent() and doneCurrent() is in one location in the code instead of six (one per platform). Reviewed-by: Michael Brasser Reviewed-by: Sarah Smith
* | qdoc: QGLWidget::colormap() returns a QGLColormap, not a QColormapRhys Weatherley2009-09-141-2/+2
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-148-46/+95
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-09-14143-19978/+2570
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audio/audiodevices/audiodevicesbase.ui
| * | | AudioDevices demo doesn't do anything on WindowsKurt Korbatits2009-09-148-276/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -put example audiodevices in layout. -added more checking to testSettings() in win32 implementation. -disabled objects in example audiodevices that are not editable. -added more checking to alsa implementation for preferredFormat(). -changed internal strings from tr to QLatin1String. Reviewed-by:Justin Mcpherson
* | | | Use redF(), etc when setting GL colorsRhys Weatherley2009-09-141-5/+3
| | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
* | | | Don't have to glEnable(GL_TEXTURE_2D) when using shaders.Rhys Weatherley2009-09-141-4/+0
| |/ / |/| | | | | | | | | | | | | | | | | OpenGL/ES 2.0 systems were giving a GL error when GL_TEXTURE_2D was enabled and disabled. Reviewed-by: trustme
* | | qdoc: size of a QGLColormap is 256 on all platforms, not just WindowsRhys Weatherley2009-09-141-1/+1
| | |
* | | qdoc: QGLFormat documentation improvementsRhys Weatherley2009-09-141-5/+9
| | |
* | | qdoc: QGLWidgets -> QGLWidget, etc, for proper doc linking.Rhys Weatherley2009-09-132-12/+12
| | |
* | | qdoc: document default values for QGLFramebufferObject propertiesRhys Weatherley2009-09-131-9/+17
| | |
* | | QGLWidget::fontDisplayListBase() is not supported under OpenGL/ESRhys Weatherley2009-09-132-2/+10
| | | | | | | | | | | | | | | | | | Update documentation and #ifdef out the implementation. Reviewed-by: trustme
* | | qdoc: qglColor() doesn't work under OpenGL/ES 2.0Rhys Weatherley2009-09-131-0/+4
| | |
* | | Make QGLWidget::renderText() desktop onlyRhys Weatherley2009-09-131-175/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | The renderText() function is only for legacy desktop systems, so revert the previous attempts to port it to OpenGL/ES. Documentation note added to direct users to QPainter::drawText() for the correct way to render text onto an OpenGL paint device. Reviewed-by: trustme
* | | Fix compilation with QT_NO_CAST_FROM_BYTEARRAY.Till Adam2009-09-131-3/+3
| | | | | | | | | | | | | | | Merge-request: 1421 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
* | | Fix -Wconversion warnings where possible.David Faure2009-09-1311-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to detect "int foo = myQReal" mistakes, one needs to compile with -Wconversion. However that flag triggers many warnings inside Qt. This commit fixes many of them, like qchar.h:295: warning: conversion to 'ushort' from 'unsigned int' may alter its value qglobal.h:1026: warning: conversion to 'qreal' from 'qint64' may alter its value qbytearray.h:441: warning: conversion to 'char' from 'int' may alter its value Other warnings remain (such as those coming from bitfields) Merge-request: 1460 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Improve upon the previous commit and allow more cases to activate.Thiago Macieira2009-09-131-32/+34
| | | | | | | | | | | | | | | | | | Use the Introspect call's return value to determine whether the service exists or not. That way, a call to a non-existing service may activate it.
* | | qdbus tool: enable service activation when calling methodsCaio Marcelo de Oliveira Filho2009-09-131-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | When calling a method of a service, qdbus tool will not check whether the service exists nor if the interface is valid. This allows DBus try to activate the service when we call the method. Merge-request: 1472 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Do not make Mac-specific checks on FreeBSD.Raphael Kubo da Costa2009-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 098be4ff adds a check for MAC_OS_X_VERSION_MAX_ALLOWED and MAC_OS_X_VERSION_10_5, which do not exist on FreeBSD. Therefore, both evaluate to 0 and a Mac-specific header ends up included. This commit properly verifies that Q_OS_MAC is defined before performing that check. Merge-request: 1477 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Merge branch '4.5' into 4.6Thiago Macieira2009-09-1210-18/+82
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
| * | Fix memory leak when deleteLater is triggered via the main menu bar.Morten Sorvig2009-09-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deleteLater was beeing created with loopLevel of 1, causing it to be defferd until QApplication::exec() returned. Add a QScopedLoopLevelCounter to increase the loopLevel while triggering the action. RevBy: Brad
| * | Remove yet another forgotten debug message.Morten Sorvig2009-09-111-1/+0
| | |
| * | Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-09-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the Qt package contains one of x86 and x86_64, pick that one. If it contains both then use the compiler default. Make a similiar decision for PowerPC-based systems. Note that this logic assumes that Qt has been configured with an architecture that is usable on the system. Reviewed-by: Marius Storm-Olsen
| * | Run on 10.3.Morten Sorvig2009-09-111-1/+1
| | | | | | | | | | | | | | | _HIViewScrollRectWithOptions needs to be declared as a weak-linked symbol in order to make static linking work.
| * | Run on 10.3 Panther.Morten Sorvig2009-09-111-1/+4
| | | | | | | | | | | | HIViewSetNeedsDisplayInRect was added in 10.4.
| * | restoring a minimized window on Windows CE didn't workJoerg Bornemann2009-09-102-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | QHttpNetworkConnection autotest: include zlib dirPeter Hartmann2009-09-101-0/+1
| | | | | | | | | | | | | | | | | | test was not building Reviewed-by: Trust Me
| * | Only reset the backend pointer after we're done with itJoão Abecasis2009-09-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 925912ebf552417306a5bd20fd986afda6a582be QNetworkReplyImplPrivate no longer holds its own pointer to the network cache and relies on the backend to get it. Since the cache is used in our call to finished, we must reset the backend only after that. This fixes a crash I was seeing in Arora... Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * | tst_qinfo: Be more verbose in case of failuresMarkus Goetz2009-09-101-0/+6
| | |
| * | Make opengl fragment program generator output license header.Jason McDonald2009-09-102-4/+57
| | | | | | | | | | | | | | | | | | | | | Stops the license checker failing each time the file is re-generated. Also added "_P" to the generated header guard, as it's a private header. Reviewed-by: Gunnar Sletta
| * | Fixes autotest for MS SQL ServerBill King2009-09-101-1/+4
| | | | | | | | | | | | Merging fix back into 4.5 tree
| * | Fixes determination of end of odbc string on deficient driverBill King2009-09-102-6/+47
| | | | | | | | | | | | | | | | | | | | | Ported this fix backwards from 4.6 to 4.5 Adds some cleanups (using QVarLengthArray), and reverting to the initial and correct calculation (when the driver doesn't deem fit to return SQL_NO_DATA).
| * | Doc: Note that Netscape plugins are only available on desktop platforms.David Boddie2009-09-091-3/+7
| | | | | | | | | | | | | | | Reviewed-by: Takumi Asaki Also-applied-as: 3f257dcf8c8ca812d60d4a6a4c2cd2da96bba526
| * | Autotest: fix the test for NUL in SAN. It was missing "www".Thiago Macieira2009-09-091-1/+1
| | | | | | | | | | | | Reviewed-by: Marius Bugge Monsen
| * | tst_qhostinfo: Backported some 4.6 fixes, increased timeoutMarkus Goetz2009-09-091-7/+4
| | |
| * | Avoid garbled output on Windows for non-ascii-compatible textEskil Abrahamsen Blomfeldt2009-09-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Windows print engine, we try to send a text item as a raw string of characters to the printer driver if this is possible. This is to facilitate using PDF-printers as much as possible, allowing them to save the text in the document so for searching etc. We can only safely do this if all the characters in the string are ASCII-compatible, i.e. in the 7 bit range, since this is the only part of the set which is guaranteed to be compatible across code pages. Task-number: 180655 Reviewed-by: Trond
generated by cgit v0.12 at 2025-08-21 10:51:45 (GMT)