summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-09-012-4/+8
| |\
| | * QSslCertificate: fix previous patch, add autotest and documentationPeter Hartmann2009-09-012-4/+8
| | | | | | | | | | | | | | | | | | The +1 must be added to the version, not the serial number. Reviewed-by: trustme
| * | Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-09-0139-211/+594
| |\ \ | | |/
| | * QSslCertificate: Add + 1 to serialNumberRaul Metsma2009-09-011-2/+2
| | | | | | | | | | | | | | | Merge-request: 1383 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| | * Implement QSslCertificate::version() and QSslCertificate::serialNumber()Raul Metsma2009-09-013-0/+11
| | | | | | | | | | | | | | | | | | | | | Task-number: 251830 Merge-request: 1383 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
| | * QMetaObject::normalizeType: fix out-of-bound access.Olivier Goffart2009-09-011-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | As reported in merge request 1375 Also use QVarLenghtArray instead of manually allocated char* Reviewed-by: Thierry
| | * doc: Fixed several qdoc errors.Martin Smith2009-09-012-10/+3
| | | | | | | | | | | | | | | Also removed four function declarations from QMargins that had no definitions.
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-013-7/+67
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-015-39/+71
| | | |\
| | | | * Fixes determination of end of odbc string on deficient driverBill King2009-09-012-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | | * | Add #define's for highp/mediump after #version/#extension headersRhys Weatherley2009-09-011-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLSL shaders require that #version and #extension must appear before any other code. The #define's we insert for highp/mediump/etc must therefore be moved down to just after them. Reviewed-by: Gunnar Sletta
| | * | | Update license headers.Jason McDonald2009-09-014-55/+54
| | | |/ | | |/| | | | | | | | | Reviewed-by: Trust Me
| | * | Update QML doc style.Michael Brasser2009-09-011-29/+9
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Keith Isdale2009-09-018654-115797/+117402
| | |\ \
| | | * | Doc for QSslError constructor parameters fixed each cons.Peter Yard2009-09-011-3/+12
| | | | |
| | | * | Added description of visualIndex condition to docs for logicalIndex()Peter Yard2009-09-011-1/+3
| | | |/ | | | | | | | | | | | | Fix for task: 214373
| | | * OpenGL/ES 2.0 compilation problem since QGLContextGroup changesRhys Weatherley2009-08-311-0/+12
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * be51485f missed some instances of qt_get_extension_funcsRhys Weatherley2009-08-311-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * More DirectFB ifdef cleanup.Anders Bakken2009-08-316-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the plugin builds but doesn't do anything when configured without -plugin-gfx-directfb Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Make cursor work in non-windowed modeAnders Bakken2009-08-315-30/+41
| | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Disable event compression when the tablet events are acceptedBenjamin Poulain2009-08-319-74/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 4.5, all tablet events are compressed not to overload the widgets with the corresponding mouse event (a mouse event is generated if the tablet event is not accepted). This behavior reduce the precision when drawing on a widget that use the tablet events. All tablet events should be sent to the widget that are accepting the tablet event. With this patch, the tablet event are filtered only if the widget ignore the first tablet event. The mouse events are compressed. There is two special cases for the filtering: First, if a tablet event is for another widget than the one ignoring the tablet, this event should not be filtered. Second, if there is a mouse press event, the mouse move event should be sent to the widget that received the mouse press event. Helped-by: Pierre Rossi Reviewed-by: Thomas Zander Reviewed-by: Bradley T. Hughes
| | | * Initialize the line coordinates in the tablet example.Benjamin Poulain2009-08-311-1/+3
| | | | | | | | | | | | | | | | | | | | For the first tablet events, polyLine contains null points. The first two line painted have an invalid origin.
| | | * Clean up directfb ifdefsAnders Bakken2009-08-3115-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | Make sure all files are wrapped in QT_NO_QWS_DIRECTFB Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Fix QT_BEGIN/END_NAMESPACE in DirectFBAnders Bakken2009-08-3114-2/+65
| | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Don't use QString(const char *) in QDirectFBScreenAnders Bakken2009-08-311-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Remove duplicated code in qdirectfbScreen.cppAnders Bakken2009-08-311-31/+1
| | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Allow setting screen size with connect optionsAnders Bakken2009-08-311-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Update the qmake autotest: re MSVC test failure findMocs and findDepsKeith Isdale2009-09-012-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MSVC is used the default DESTDIR makes use a release/debug suffix. For these tests DESTDIR needs to be "."/ Minor code cleanup was done whilst correcting these effected .pro files Reviewed-by: Lincoln Ramsay
| * | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-316-12/+157
| |\ \ \ | | |_|/ | |/| |
| | * | Fix #error line not to have a ' as it's not correctAlbert Astals Cid2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 753 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | Reset QTemporaryFile's state after failed open() on WindowsJoão Abecasis2009-08-312-8/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in 4.5.2 where QTemporaryFile would no longer attempt to generate a random name after a failed open. Under certain situations, this led to a non-random file being left behind in QDir::tempPath when using the fallback implementation of QFile::copy. Avoid calling QFSFileEngine::setFileName() on a template, so as not to process it as file name. By consistently not calling setFileTemplate in the constructor, we also delay allocation of the fileEngine. Changes made to that function also keep it from unnecessarily allocating the fileEngine. Task-number: 260165 Reviewed-by: Thiago Macieira
| | * | QNAM HTTP Code: Some tests where failingMarkus Goetz2009-08-312-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ietf.org changed their server to use gzip, therefore our check for the content-length reply header was bogus. Rev-By: Peter Hartmann
| | * | Don't crash when convert Indexed8 without colortable to QPixmapGunnar Sletta2009-08-312-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implicitly adds "grayscale" support for indexed 8, but only for the conversion. The alternative would be leave the pixels uninitialized which would be less nice... Reviewed-by: Samuel
| | * | Invalidate cached QVectorPath when QPainterPath changesGunnar Sletta2009-08-311-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Performance: don't call WinHttpGetProxyForUrl for a file URL (e.g. from webkit)David Faure2009-08-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That method can be slow, since it does a DHCP query followed by a DNS query (sometimes followed by a Netbios query, too)... no point in doing it for every file URL loaded in webkit. Merge-request: 1128 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Adapt to libpng 1.4.0beta74 API changeBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From libpng changelog: version 1.4.0beta74 [August 8, 2009] Changed png_ptr and info_ptr member "trans" to "trans_alpha". Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Qt fails to build with libpng 1.4 betasBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt expects a trans_values member in png_info_struct; this member has been renamed to trans_color in libpng 1.4. Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | fix doc. id maps to QObject::objectName, not QGraphicsObject::setOpacity ;-)Riccardo Iaconelli2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Riccardo Iaconelli <riccardo@kde.org> Merge-request: 1371 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Update license header for new file from merge requestThiago Macieira2009-08-311-14/+14
| | | |
| * | | Use system-wide proxy settingsDavid Faure2009-08-312-0/+6
| | | |
| * | | Add QNetworkProxyFactory::setUseSystemConfigurationEnabled(true)David Faure2009-08-313-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply following the system configuration for the proxy used to require writing a QNetworkProxyFactory subclass. The static setter makes this easier, so apps can in one line say "I want to use the system proxy settings". Solution and method name suggested by Thiago.
| * | | Updated lisence headers for QMarginsJens Bache-Wiig2009-08-312-26/+26
| | | |
| * | | Make QMargins a proper classJens Bache-Wiig2009-08-319-162/+596
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we need QMargins for other things then the CSS helper functions in drawutil, we have to make it more generic. It is already useful for QWidget::contentsMargins for example. This ensures we have some flexibility on how to use and modify it in the future. Reviewed-by: mbm
| * | | Refactoring qatomic_windows.hJoão Abecasis2009-08-315-323/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidated Interlocked* declarations and API implementation through macro hackery, (hopefully) for improved readability and maintainability. Fixes anti-aliasing warnings with MinGW in qatomic_windows.h. Gcc builds now use inline assembly for atomic operations, instead of relying on Interlocked* functions which aren't consistently declared across implementations (mingw32, mingw-w64, wine... others?). Drops support for VC 6 and MetroWerks. Reviewed-by: Thiago Macieira
| * | | Fixed initialization order in QGLContextGroup constructor.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Remove unused variable in GL2 engine.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Added context pointer to QGLContextGroupResources.Kim Motoyoshi Kalland2009-08-314-126/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I renamed QGLContextGroupResources to QGLContextGroup because we are using it to identify context groups. I also added a pointer to one of the contexts in the group. Together with qgl_share_reg(), the pointer can be used to find all contexts in a group. I renamed QGLContextPrivate::qt_get_extension_funcs() to QGLContextPrivate::extensionFuncs() to follow Qt's naming convention. Reviewed-by: Trond
| * | | Minor improvement when parsing matrix transformation in SVG.Ariya Hidayat2009-08-311-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a specialized version of numbers parsing that works on a short QVarLengthArray since a transformation matrix has at most 6 elements. Reviewed-by: Kim
| * | | Speed-up floating-point decoding for SVG parsing.Ariya Hidayat2009-08-311-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of comparing the character to '0' and '9', use bit fiddling to detect that the character is a digit between '0' and '9'. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is now 10% faster, going down from 85.3 millions instructions to 77.2 millions. Mostly this is due 46% speed-up in parseNumbersList() function, from 26.9 millions instructions to just 18.4 millions. Reviewed-by: Kim
| * | | Don't show the pad navigator example full screen.Andreas Aardal Hanssen2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a change added by 6a3de1f5 by mistake (according to the S60 guys). The proper fix may be to add a -small-screen argument, or to run fullscreen on embedded only. Reviewed-by: jbarron