summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add some autotests for QScriptProgramKent Hansen2009-10-231-0/+81
|
* add getter functions and comparison operators to QScriptProgramKent Hansen2009-10-232-0/+60
|
* separate the logic shared by evaluate(QString) and evaluate(QScriptProgram)Kent Hansen2009-10-232-68/+60
| | | | Introduce helper function evaluateHelper().
* delete the executable when the program is destroyedKent Hansen2009-10-231-2/+5
|
* add compile() and evaluate() functions to public apiKent Hansen2009-10-231-0/+4
|
* some preliminary work on QScriptProgramKent Hansen2009-10-095-0/+372
|
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-090-0/+0
|\ | | | | | | | | Conflicts: src/opengl/qglpixelbuffer_egl.cpp
| * Back port fixes from PowerVR driver in 4.6 to 4.5Rhys Weatherley2009-10-093-9/+16
| | | | | | | | | | Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0 Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab
| * Fix detection of pbuffers on OpenGL/ES systemsRhys Weatherley2009-10-091-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 Conflicts: src/opengl/qglpixelbuffer_egl.cpp Back-port of 46843022acd7322c42a98858ec52b65ce7451d06
* | Fix printing bitmap fonts on X11 with FontConfig enabledEskil Abrahamsen Blomfeldt2009-10-093-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FontConfig was enabled, bitmap fonts would often get a different pixel size than the one we requested. Usually the size would only be a pixel off, but this was especially visible when printing in highres with bitmap fonts, because in those cases we would request a pixel size which was computed based on the printer's high dpi. The result was that all printed text with bitmap fonts would be really really tiny. The fix falls back to using the XLFD font engine when using bitmap fonts (when the returned pixel size is different from the requested), because this engine scales the fonts for us. This will cause bitmap fonts to be rendered without antialiasing. Task-number: QTBUG-3620 Reviewed-by: Simon Hausmann
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-0912-113/+95
|\ \
| * | Fixed documentation links in README.s60Miikka Heikkinen2009-10-091-11/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-4806 Reviewed-by: Janne Koskinen
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-099-91/+72
| |\ \
| | * | Fix build on Symbian: make sure sym_iap_util.h can be found.Frans Englich2009-10-097-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amend commit faef2f5101287ad8ce94cf8e7a4d574a7d6267fd, with this build fix. Task-number: QTBUG-4743 Reviewed-by: Shane Kearns
| | * | Doc: update known issues page (a little).Volker Hilsheimer2009-10-091-78/+62
| | | |
| * | | Changed several S60 references to Symbian references in docs.Miikka Heikkinen2009-10-093-17/+15
| | | | | | | | | | | | | | | | Reviewed-by: Janne Koskinen
* | | | For this test to work you need to enable autoSip on Windows Mobileninerider2009-10-091-0/+3
| |/ / |/| | | | | | | | | | | | | | Test fixed to send the correct signal type on windows ce. Reviewed-by: Marco
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-0951-184/+252
|\ \ \ | |/ /
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-0935-90/+68
| |\ \
| | * | Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-0931-56/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
| | * | Revert "Workaround for OpenC daylight saving cache issue when using ↵Aleksandar Sasha Babic2009-10-091-30/+2
| | | | | | | | | | | | | | | | | | | | | | | | localtime_r." This reverts commit 2f7d1318d2dc63322a468d8c301ae718eaba0d03.
| | * | Fixed crash when printing to files under CocoaGunnar Sletta2009-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we select save as PDF in the print dialog, we get a new PMPrintSession in the printInfo object, while our stored one is deleted, so we update the pointer to be on the safe side Reviewed-by: msorvig
| | * | Fixed text positioning when printing in HighResolution on Mac OS XGunnar Sletta2009-10-091-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: Richard
| | * | Fix qdoc warning about undocumented parameterSimon Hausmann2009-10-091-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust me
| * | | Fixed miscellaneous minor problems with Symbian docs.Miikka Heikkinen2009-10-093-7/+9
| |/ / | | | | | | | | | Reviewed-by: Espen Riskedal
| * | Fix for tst_qfile::map auto test in Symbian OS 3.1.Janne Anttila2009-10-091-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The map test case panic with E32User-Cbase 66 in N95 without this fix. This happens sisnce Open C bug where mmap may leave and trap handler is not inside OpenC. The workaround is to install the necessary TRAP handler in Qt, before calling mmap. AutoTests: tst_qfile::map passes Reviewed-by: Janne Koskinen
| * | Made QPen::setDashOffset() work with non-custom dashed lines.Kim Motoyoshi Kalland2009-10-091-3/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-2738 Reviewed-by: Trond
| * | 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ä