summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add a way to allow tracking the originating object with QNetworkRequest.Simon Hausmann2009-10-094-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Added setOriginatingObject() and originatingObject() to QNetworkRequest that internally tracks the QObject using a QWeakPointer. Reviewed-by: Lars Knoll Rubberstamped-by: Thiago
| * | Autotest: fix false positives with MSVC.NET 2003Thiago Macieira2009-10-091-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | This is definitely a compiler bug. The compiler forgets to adjust the value of the pointers inside the template operator== function. If you make the call outside the template function, it works as expected. Reviewed-by: Trust Me
| * | Autotest: fix forward-declaration test.Thiago Macieira2009-10-091-1/+5
| | | | | | | | | | | | | | | | | | | | | The problem was that we forward-declared as struct, but the function was implemented as class. It's different on MSVC. Reviewed-by: Trust Me
| * | Fixed doc for softkeys in the qwidget doc.Denis Dzyubenko2009-10-091-2/+1
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Doc: update the compiler notes about Sun CC's STL not being supportedThiago Macieira2009-10-091-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | The default STL (Rogue Wave STL) is far too old for Qt. It doesn't meet the ISO C++ 98 specification. Using a more recent (and standards-compliant) STL like stlport4 enables Qt to build even QtWebKit on Solaris. Also change the note indicating we're using Sun Studio 12, not 8.
| * | Fix QHostInfo IP resolution when there's no reverse for the IP.Thiago Macieira2009-10-092-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to resolve 10.3.4.6, you're probably going to get that it doesn't exist. On some systems, getnameinfo will return the IP address in string form (Linux, without NI_NAMEREQD). On some others, it will fail (Mac, Windows). So harmonise by gracefully handling the case in which getnameinfo fails. Possible behaviour change: we don't try the forward resolution any more, after completing the reverse one. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * | Help Nokia X86 compiler to compiler qbuttongroup autotest.Janne Anttila2009-10-091-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jan-Arve Sæther2009-10-0984-812/+1280
| |\ \
| * | | Rename identifyNonFloatItems -> identifyFloatItems.Jan-Arve Sæther2009-10-082-8/+8
| | | | | | | | | | | | | | | | We changed the behaviour of that, so the name should reflect that.
| * | | Merge branch 'openbossa-expanding' into 4.6Jan-Arve Sæther2009-10-082-21/+26
| |\ \ \
| | * | | Store the floating items instead of the non-floating items.Jan-Arve Sæther2009-10-072-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Makes the code a bit easier to read and speeds up setItemsGeometries() in the normal use-case.
* | | | | All mousewheel tests skipped on Windows CEninerider2009-10-091-6/+3
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Due to more problems with this test, they are skipped alltogether on Windows CE. Reviewed-by: Joerg
* | | | Check the framebuffer format against a format, not a texture targetRhys Weatherley2009-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was comparing QGLFramebufferObjectFormat::textureTarget() against GL_RGB to determine if alpha was present. This should be internalTextureFormat() instead. Reviewed-by: Sarah Smith
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-097-6/+38
|\ \ \ \
| * | | | hellogl now runs on QT_OPENGL_ES_1 (ie N95).Sarah Smith2009-10-097-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effort to have examples show portable GL code continues. One #ifdef in whole example and it now runs on N95 and desktop. Reviewed-by: Rhys Weatherley
* | | | | Suppress unnecessary warning messages if pbuffers are not supportedRhys Weatherley2009-10-091-3/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | EGL_SAMPLES should be 1, not -1, to select number of samplesRhys Weatherley2009-10-091-1/+1
|/ / / / | | | | | | | | | | | | Reviewed-by: trustme
* | | | Prevent double-destroy of a pbuffer's EGLSurfaceRhys Weatherley2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the surface memory leak in b125af1b for widgets caused this knock-on effect in pbuffers. Reviewed-by: trustme
* | | | Fix detection of pbuffers on OpenGL/ES systemsRhys Weatherley2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was searching for an exact pbuffer format of RGBA = 1, 1, 1, 0, which of course is never going to happen. Instead, search for the best format. Reviewed-by: trustme
* | | | Don't print EGL buffer size if it isn't set.Rhys Weatherley2009-10-081-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | Color role with higher contrast for focusrectAlessandro Portale2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Low-risk, high value change. Beta worthy! As much as QPalette::Highlight sounds like a suitable color role for drawing a focus rect... It simply did not work well with a lot of S60 themes (e.g. the default N95 theme). QPalette::Text is a better candidate, since the S60 themes promise a good contrast of text on background graphics. Reviewed-By: Sami Merilä
* | | | Fix .ui of Styledemo (Layout tweaks)Alessandro Portale2009-10-081-184/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's make sure to have enough layout spacings around the widgets in order to see the focusrect. Also, the issue with the growing dialog is fixed. It was the spinbox and it's label which with the stylesheets set did not have enough horizontal space, and thus made the dialog grow on the following CSS change Reviewed-By: TrustMe
* | | | QS60Style: Re-enable color-from-skin-part extractionAlessandro Portale2009-10-081-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After introducing native pixmap support, we had some crashes on certain setups (e.g. 3.2 Emulator) when accessing data that came from native pixmaps (FBServ). However, after fix 064674426ef0c446561b0c338441bb7d5ca091bf this is not reproducable, anymore. Therefore let's re-enable color extraction and enjoy better color palettes. Reviewed-By: Sami Merilä
* | | | Fixes XPASS on the QFileDialog test on CarbonOlivier Goffart2009-10-081-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: alexis
* | | | Merge branch '4.5' into 4.6Thiago Macieira2009-10-084-8/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview.cpp
| * | | QHeaderView: fixed the sizeHint with hidden sectionsThierry Bastian2009-10-071-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to check the 100 first sections and 100 last sections Now we make sure we check 100 visible sections Task-number: 255574
| * | | ignore invalid WM_KEYDOWN messages on WindowsJoerg Bornemann2009-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some strange reason, I get the following message if I press a non-numerical key on the SIP of a Samsung Omnia device, running Windows mobile 6.1: WM_KEYDOWN wParam == 0 lParam == 1 That message is invalid. We must ignore it. Reviewed-by: mauricek
| * | | fix ts and qm targets under windowsOswald Buddenhagen2009-10-071-4/+1
| | | |
| * | | Fix ASSERT caused by Plastique style when setting an application font with a ↵Bradley T. Hughes2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pixel size Use QFontInfo to query the pointSize() instead of asking the font directly, fixing this assert: ASSERT failure in QFont::setPointSize: "point size must be greater than 0", file text/qfont.cpp, line 855 Task-number: QTBUG-3555 Reviewed-by: Simon Hausmann
* | | | Fixed compile.Rohan McGovern2009-10-081-1/+2
| | | |
* | | | Skip the crashing selftest on MacOlivier Goffart2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The signal handler does seem to work on Mac for segfault Reviewed-by: Rohan McGovern
* | | | Stabilize TestsOlivier Goffart2009-10-082-9/+9
| | | |
* | | | qdoc: Removed some debug code and #if 0 code.Martin Smith2009-10-081-113/+1
| | | |
* | | | doc: Changed the format of the since list.Martin Smith2009-10-087-147/+433
| | | | | | | | | | | | | | | | | | | | This is a big change from the original, and I expect we will want modifications.
* | | | Skipped test for Windows Mobile involving mouse move events.ninerider2009-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Events caused by dragging a mouse are currently unavailable in Windows Mobile. Reviewed-by: Joerg
* | | | Remove incorrect optimisation in S60 widget / control stack syncShane Kearns2009-10-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrect optimisation - for popup windows, Qt's focus is moved before hide_sys is called, resulting in the popup window keeping its elevated position in the CONE control stack. This can result in keyboard focus being in an invisible widget in some conditions - e.g. QTBUG-4733 Task-number: QTBUG-4733 Reviewed-by: axis
* | | | Conservative fix for link error with ARM RVCT compiler on symbian sbsv2Shane Kearns2009-10-082-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. However windows builds don't support export of templated class, and export the vtable implicitly when there is an exported member function. Task-number: QTBUG-4593 Reviewed-by: Thierry Bastian
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-0824-164/+223
|\ \ \ \
| * | | | Carbon: better wheel acceleration patchRichard Moe Gustavsen2009-10-082-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that scrolling appears to be slow when using non-mac mice with the carbon build. This patch introduces a an acceleration algorithm that closer resembles the one used by Cocoa. Rev-By: prasanth
| * | | | Mac: fix auto test to reflect recent changes in wheel event handlingRichard Moe Gustavsen2009-10-081-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on mac. Since mouse wheel events are accelerated by the OS on mac, we cannot multiply the delta with QApplication::wheelScrollLines, since this will make scrolling behave far to fast. To change the speed of wheel events on Mac, one should use system preferences. This patch updates the test to reflect his difference. Rev-By: ogoffart
| * | | | Revert "Ensure that qmake doesn't lose the error code when processing subdirs"Andy Shaw2009-10-083-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c15b370c9db16fdbfd9e7bec89ee9bf8c1110827 since it is causing a problem with the autotests so that will be investigated further before this is resubmitted.
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-10-084-1/+29
| |\ \ \ \
| | * | | | Fix compile errors on mingw (The version supplied with Qt 4.5)Prasanth Ullattil2009-10-084-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the missing defines Reviewed-by: Denis
| * | | | | Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal
| * | | | | Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-085-82/+91
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal
| * | | | Fix to Symbian accelerated scrolling problem.Jani Hautakangas2009-10-082-28/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for scrolling bug was that CFbsBitmapDevice wasn't informed if CFbsBitmap was resized. However, it seems that scroll implementation in QRasterPixmapData is faster that CFbsBitGc->CopyRect so this is also a patch which changes QS60PixmapData's scroll function to call QRasterPixmapData::scroll(). Reviewed-by: Janne Koskinen
| * | | | Prevented input composition in password fields on X11 and Windows.axis2009-10-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the behavior in 4.5. Task: QT-2257 RevBy: Simon Hausmann
| * | | | Fixed trailing whitespaces for f831c60a.Janne Anttila2009-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Workaround for OpenC daylight saving cache issue when using localtime_r.Janne Anttila2009-10-081-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenC incorrectly caches DST information between localtime_r calls, i.e. if previous call to localtime_r has been called for DST affected date, also the second call will be affected by DST even the date is such that DST should not be applied. The workaround is to call mktime with non-DST affected date before calling localtime_r. mktime call resets the OpenC internal DST cache to right value and localtime_r will return correct values. This commit can be reverted once Open C bug 9525 has been reverted. AutoTest: Fixes tst_QDateTime::totime_t Reviewed-by: Aleksandar Sasha Babic
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-084-26/+4
| |\ \ \ \