summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * QHttpNetworkConnection autotest: include zlib dirPeter Hartmann2009-09-091-0/+1
| | | | | | | | | | | | test was not building Reviewed-by: Trust Me
* | Added example to docs for QPainter::beginNativePainting().Samuel Rødal2009-09-112-2/+24
| | | | | | | | | | | | Hopefully this helps clarify the use of beginNativePainting(). Reviewed-by: Trond
* | Add platform specific libraries required to use OpenVG to star exampleIain2009-09-111-0/+1
| | | | | | | | Reviewed-by: Jason Barron
* | Don't use UI_TOOLS for browser demo on QWSAnders Bakken2009-09-111-1/+1
| | | | | | | | | | | | | | | | | | When cross-compiling and shadow building Makefiles are not generated for designer and libQtUiTools. For this reason designer usually doesn't build for people trying to compile the browser example on QWS due to unresolved externals or weird link errors when the build tries to pick up the system Qt libraries instead. The mechanism to fix this is already in place for S60.
* | Made GL window surface work better with native child widgets.Samuel Rødal2009-09-112-18/+64
| | | | | | | | | | | | | | Need to unbind the window surface FBO and re-bind it in the child widget's context before doing a blit. Reviewed-by: Kim
* | Respect the layoutDirection property of the parent widget.Jan-Arve Sæther2009-09-114-20/+107
| | | | | | | | | | | | | | Add a layoutDirection autotest, and sprinkle some of the tests with checkReverseDirection() Reviewed-by: Eduardo M. Fleury
* | Do not use FBO as backend for window surface in opengl engineEskil Abrahamsen Blomfeldt2009-09-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | There are too many platform regressions when using the FBO as a backend for the opengl engine. We need to find whether it's possible to work around them, but for the time being, to preserve compatibility, we only use FBOs when using the opengl2 engine. Example of issue: Smudged text and smudged diagonal lines on Windows XP when running with opengl engine and latest nvidia driver. Reviewed-by: Trond
* | Compile fix for windowsRobert Griebl2009-09-111-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Better failure message when it failsPaul Olav Tvete2009-09-111-0/+4
| | | | | | | | | | | | | | Some platforms do not recalculate the Qt::WA_UnderMouse attribute when a widget is shown underneath the mouse. Reviewed-by: Olivier
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-1114-33/+100
|\ \
| * | Skip pointless testPaul Olav Tvete2009-09-111-0/+3
| | | | | | | | | | | | | | | | | | It is planned that this test will do something sensible in the future. Reviewed-by: Jesper
| * | Out of memory fix for qUncompressRobert Griebl2009-09-113-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qUncompress shouldn't crash when running out of memory, since it might deal with buffers which are not under user control (same behavior as Qt 4.5). It will however throw a std::bad_alloc exception if Qt is compiled with exception handling. Reviewed-by: Harald Fernengel Reviewed-by: Ralf Engels Reviewed-by: Lars Knoll
| * | Doc: QHeaderView::section:checked was left out of stylesheet docs.Geir Vattekar2009-09-112-1/+7
| | | | | | | | | | | | | | | Task-number: 254741 Reviewed-by: Trust Me
| * | Fixed clipping bugs in GL2 graphics system with oxygen style.Samuel Rødal2009-09-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGL2PaintEngineEx::clip() needs to call ensureActive() to make sure the engine is active and synced before doing any clipping operations. We also need to set needsSync to false before entering setState() since otherwise we end up in an infinite loop in the case where replayClipOperations() again calls QGL2PaintEngineEx::clip(). Reviewed-by: Tom
| * | Enabled use of graphics system with old GL engine for testing.Samuel Rødal2009-09-111-1/+9
| | | | | | | | | | | | Reviewed-by: Trond
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-09-11128-20092/+2628
| |\ \
| | * | small optimization for variant handling in animationsThierry Bastian2009-09-111-3/+9
| | | | | | | | | | | | | | | | Just one test less
| | * | animations now display a warning if they don't have a end valueThierry Bastian2009-09-112-2/+7
| | | | | | | | | | | | | | | | also improved the autotests
| | * | Fix autotests on QMenuBarThierry Bastian2009-09-111-1/+6
| | | | | | | | | | | | | | | | We have mousemove events but we were missing the mouse press ones.
| | * | 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
| * | | Fix compile errors (missing uncaught_exception definition) on Symbian^3Iain2009-09-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using STDCPP in Symbian^3, the definition for uncaught_exception *must* be provided before any attempt to include e32base.h is made. This is because STDCPP support disables the standard Symbian definition of uncaught_exception, so the version from <exception> needs to be used instead. Reviewed-by: Jason Barron
* | | | Fixed QWidget::activateWindow for Symbian.Janne Anttila2009-09-112-17/+52
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activeWindow documentation says: "active window is a visible top-level window that has the keyboard input focus" and "If you want to ensure that the window is stacked on top as well you should also call raise(). Note that the window must be visible, otherwise activateWindow has no effect." What we were doing earlier was basically raise. Now we just set the keyboard focus to underlying native window. Task-number: 260685 Reviewed-by: Jason Barron
* | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-1110-73/+163
|\ \ \
| * \ \ Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-114-6/+17
| |\ \ \
| | * | | Fixed a bug in the autotest for q3progressbar.Martin Smith2009-09-112-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "standard" test would sometimes fail (Mac OS X) because extra paint events could be generated, which would cause paintNumber to be > 1. Comparing it to 1 would fail. This test should be redesigned, I think.
| | * | | 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