summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* support loops: implement for(), next() & break()Oswald Buddenhagen2009-07-204-4/+149
| | | | cherry-picked 88de3e6a45a41baecb7e56e7cbab7fec30ac0a1c from creator
* implement if() testOswald Buddenhagen2009-07-201-1/+81
| | | | cherry-picked d89338aa810861c636278be4a5bb5d8b23ce99b8 from creator
* implement {greater,less}Than(), equals(), clear() & unset()Oswald Buddenhagen2009-07-201-5/+53
| | | | cherry-picked dbdbe92d5d66cbd466bcc0aea532ce79a034ab84 from creator
* support custom functions: implement defineTest(), defineReplace(), ↵Oswald Buddenhagen2009-07-204-110/+283
| | | | | | | defined(), return() & export() cherry-picked d077ba29c34782d1699693b6e3f07c2037eecdba and 93571f7d42a81a8236ceac1f745ef277f194f1ca from creator
* remove return values from the visitors which need noneOswald Buddenhagen2009-07-203-38/+36
| | | | cherry-picked 6ca93b31fd95ef7cce78a5e0d5225e50d6007f2f from creator
* surround file inclusion with saving/restoring condition stateOswald Buddenhagen2009-07-201-1/+4
| | | | cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator
* fix conditionals, in particular the nested else handlingOswald Buddenhagen2009-07-201-31/+27
| | | | | | | | this also removes the optimization to skip test function calls which appear to be part of a failed test, as this could skip includes, etc. as well. cherry-picked ed00bd2c85cbf2c1bea63dc18d0ae7084b4fb65f from creator
* fix m_invertNext effect scopingOswald Buddenhagen2009-07-201-2/+4
| | | | | | | an evaluation function can be an include statement. the included code must neither inherit nor change the current inversion state. cherry-picked 68b1b828e6030b4fe26ca9ffc4ee7a0b4bfe8f4e from creator
* put condition state variables into a structureOswald Buddenhagen2009-07-202-23/+32
| | | | | | | to enable cleaner save/restore - for later cherry-picked 51f5ee959f58ee198e0fc51e2ad0161c612bf8d1 and 3104e4c121f3209890823db69a7c09d644b90951 from creator
* return value cleanupOswald Buddenhagen2009-07-201-97/+61
| | | | | | | | functions which have essentially two return values are kinda confusing. so represent file & parse errors as false in the regular evaluation result (like qmake effectively does). cherry-picked cee3ca324e6979d6c476001cafb452a286f09a69 from creator
* ifdef cleanupOswald Buddenhagen2009-07-201-1/+1
| | | | cherry-picked from d2a8449bea58275723e769cd41c085468cb56295 from creator
* compile against the Windows 7 SDK RCBradley T. Hughes2009-07-201-15/+16
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOswald Buddenhagen2009-07-204-32/+240
|\
| * doc: Changed several \reimp to \internalMartin Smith2009-07-202-19/+19
| | | | | | | | The base function was \internal pr private.
| * On Vista the native file dialog search feature return wrong paths.Prasanth Ullattil2009-07-201-4/+208
| | | | | | | | | | | | | | | | | | | | Windows Vista (& above) allows users to search from file dialogs. If user selects multiple files belonging to different folders from these search results, the GetOpenFileName() will return only one folder name for all the files. To retrieve the correct path for all selected files, we have to use Common Item Dialog interfaces. Task-number: 258087 Reviewed-by: Jens Bache-Wiig
| * doc: Print warning where \reimp is used where \internal should be used.Martin Smith2009-07-201-9/+13
| | | | | | | | e.g. '\reimp' in myFunc() should be '\internal' because its base function is private or internal
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-2044-629/+636
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * Fix QTextCodec case-insensitive comparison while in a Turkish locale.Thiago Macieira2009-07-201-4/+8
| | | | | | | | | | | | | | In Turkish, lowercase('I') is 'ı', which means comparing "iso-8859-1" to "ISO-8859-1" will fail. Reviewed-by: Denis Dzyubenko
| * Fix assert in message handling.Frans Englich2009-07-203-4/+28
| | | | | | | | | | | | | | Trivial fix. Reported by Michael Brasser. Task-number: 258337 Reviewed-By: Peter Hartmann
| * Fix the hand scrolling in QGraphicsView that will stop unexpectedly.Alexis Menard2009-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | If you start a hand scrolling and during moving, you press another button of the mouse than the left one, the scrolling suddently stop working. In mouseReleaseEvent we just stop the hand scrolling if the button is left. Task:258356 Reviewed-by:janarve
| * Fix crash when native socket notifiers would send a notification after being ↵Norwegian Rock Cat2009-07-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled. Spend a lot of time looking at this and at the CoreFoundation source code and it seems that we really do get a notification even after the notifier is disabled. I suspect there's a race condition between when we disable the socket notifier, but the kernel flags it as needing a read, then CoreFoundation just sends the notification without checking if the CFSocket has been disabled. No further notifications come of course. Since this breaks the invariant that was set in the assert, I'm replacing it with an if check. Task-number: 258198 Reviewed-by: Bradley T. Hughes
| * fix crash due to null pointer referencingAlex2009-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | during application desctruction globalEngineCache is deleted as part of Q_GLOBAL_STATIC macro. Other instances of code that happen to use QRegex after the cache destruction will subsequently crash. Most common reason are other Q_GLOBAL_STATIC instances which happen to use QRegExp as part of their destructor. Reviewed-by: Rhys Weatherley
| * don't rely on system codec when handling PO filesOswald Buddenhagen2009-07-175-8/+17
| | | | | | | | | | - make -input-codec affect PO files, default to UTF-8 - add -output-codec for PO files, same default
| * QDirIterator: Doc fixes and whitespace cleanupJoão Abecasis2009-07-171-19/+12
| | | | | | | | | | | | There is no QDirIterator::isValid() function. Reviewed-by: David Boddie
| * Refactoring QDirIteratorPrivate::pushSubDirectoryJoão Abecasis2009-07-171-26/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pushSubDirectory was operating on nextFileInfo when it should really be using the path received as argument. This fixes an issue introduced when currentFilePath variable was removed, that was exposed in the auto-tests; fixes a regression introduced in 4.5.0 -- test case a couple of commits back. This also allows refactoring calling code and avoid repetition. Task-number: 258230 Reviewed-by: Olivier Goffart
| * QDirIterator: reducing "randomness"João Abecasis2009-07-171-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | The difference between a canonical and absolute paths is subtle, and not what QDirIterator is about. With this change, we still avoid loops generated by symbolic links but won't duplicate entries because of these differences. While at it, when avoiding loops with symbolic links, please don't mess with the next path! That only added inconsistency. Reviewed-by: Olivier Goffart
| * QDirIterator was returning inconsistent dataJoão Abecasis2009-07-171-6/+1
| | | | | | | | | | | | | | One less variable to maintain reduces the number of bugs and improves consistency. Reviewed-by: Olivier Goffart
| * Test case for QDirIterator regression introduced in 4.5.0João Abecasis2009-07-171-10/+21
| | | | | | | | | | Task-number: 258230 Reviewed-by: Olivier Goffart
| * Fix deadlock in the QWS server when destroying lots of windowsTom Cooksey2009-07-172-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, don't call QWSWindowSurface::winId() in the destructor, as it will actually request a new id if there isn't already one around - which is a bit silly and highlighted the "real" bug. Second, make sure QWSDisplay::Data::takeId() asks for 1 new id before waiting for more ids to arrive. This is because waitForCreation() calls QWSServer::processEventQueue(). If the events in the queue cause takeId() to be called, QWSDisplay::Data::takeId() gets called recursively. Even though there will be a create 15 ids command in the queue, that will only allow 15 QWSDisplay::Data::takeId() calls to return. The 16th call to QWSDisplay::Data::takeId() on the stack will not be able to return because all the IDs have been taken and (because it has been called recursively) no new create id commands have been generated. So the 16th call to takeId() spins in waitForCreate(). Reviewed-by: Paul
| * reorganize numerus form count normalizationOswald Buddenhagen2009-07-179-30/+51
| | | | | | | | | | | | replace implicit normalization of individual messages on file writeout with global normalization which is called by the command line tools. this should a) be faster and b) cover the most critical case: lrelease.
| * QUdpSocket: Doc improvementMarkus Goetz2009-07-171-0/+3
| | | | | | | | | | Task-number: 236891 Reviewed-By: David Boddie
| * Prepare device in DFBPaintEngine::beginAnders Bakken2009-07-171-0/+2
| | | | | | | | | | | | | | 86ea4dbb5a748491656d9621ecd58238bc3e3d82 accidentally took out this line. Reviewed-by: TrustMe
| * Mark virtual functions as virtual in DFBPaintEngAnders Bakken2009-07-171-27/+26
| | | | | | | | | | | | Make the code easier to read. Reviewed-by: TrustMe
| * Remove unused function in QDirectFBPaintEngineAnders Bakken2009-07-172-34/+0
| | | | | | | | | | | | | | drawColorSpan is never called from anywhere so we might as well get rid of the code. Reviewed-by: TrustMe
| * Don't create dfbsurface in video mem if systemonlyAnders Bakken2009-07-171-1/+3
| | | | | | | | | | | | | | If DSCAPS_SYSTEMONLY is specified we shouldn't try to create the surface in video memory. Reviewed-by: TrustMe
| * Clean up directfb bit flippingAnders Bakken2009-07-178-69/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB declares variables that are bit fields as enums. E.g. DFBSurfaceCapabilities caps; caps |= DSCAPS_LOCK; // doesn't compile in C++ Work around this problem by declaring operators for these operations. This greatly improves the readability of the code. Reviewed-by: TrustMe
| * Fix accidental selection of popup items under the mouse in QComboBoxmae2009-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | If the widget under mouse is hidden, Qt can generate a synthetic mouse move event which gets delivered to the already hidden widget. This can then result in the wrong item being selected. Workaround: in QListView, ignore mouse move events when the widget is hidden. Reviewed-by: Denis
| * tst_qnetworkreply: Removed warningMarkus Goetz2009-07-171-0/+1
| | | | | | | | Reviewed-by: TrustMe
| * Removed outdated information from QNetworkRequest documentationMarkus Goetz2009-07-171-3/+1
| | | | | | | | Reviewed-by: TrustMe
| * Enhanced QDirModel documentationMarkus Goetz2009-07-171-1/+4
| | | | | | | | Reviewed-by: Volker Hilsheimer
| * Update the example TrafficInfo for GCC 3.3Benjamin Poulain2009-07-171-1/+3
| | | | | | | | | | | | | | The example TrafficInfo did not compile on GCC 3.3 due to a bug in the parser of GCC. Task-number: 258208
| * Don't assume that raster can do porter duff in dfbAnders Bakken2009-07-171-5/+1
| | | | | | | | | | | | | | PorterDuff should only be enabled if the raster engine says it is. E.g. if we're painting on a format with alpha. Reviewed-by: TrustMe
| * Fixed bug where line widths were rounded to integers in the GL engine.Kim Motoyoshi Kalland2009-07-161-1/+1
| | | | | | | | | | | | | | Regression from Qt 4.4. Task-number: 257990 Reviewed-by: Tom
| * Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | | | | | | | | | | | | | If you had deleted a VideoWidget, it could not free the memory taken because we still had a reference on it. Task-number: 258202
| * Better caching of file system icon providers.Norwegian Rock Cat2009-07-161-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that we weren't doing any caching of icons provided by the file system. We now use the similar trick that's used on Windows which does some caching on the file extension. We do fill up the cache needlessly with extra information (16, 32, 64, and 128) icons. We probably could be better with a iconRef engine that generates these sizes on demand. Still performance is 100% better with this which means using it in itemviews works. Reviewed-by: Jens Bache-Wiig
| * Clean up qdirectfbpaintengine.cppAnders Bakken2009-07-151-149/+150
| | | | | | | | | | | | | | | | - Move implementation of debug functions to the bottom of the file. - Move ImageCache stuff to under QDirectFBPaintEnginePrivate - Move SurfaceCache stuff to under QDirectFBPaintEnginePrivate Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
| * Don't force a lock in QDirectFBPaintEngine::clipAnders Bakken2009-07-152-27/+5
| | | | | | | | | | | | | | | | | | | | | | Pretty much every paint operation on DirectFB surfaces starts with a clipping operations which until now would always cause a IDirectFBSurface->Lock(). This was to make sure QRasterBuffer::prepare had been called so QClipData::initialize() would allocate a big enough array for its spans. We can safely not make QDirectFBPaintDevice::memory() return 0 until we actually fall back. Reviewed-By: Donald <qt-info@nokia.com>
| * Clean up rect/line drawing in dfb paintengineAnders Bakken2009-07-151-82/+63
| | | | | | | | | | | | | | | | Slight optimization by using the pluralized functions when possible. Also make templatized helper functions to avoid near-duplication of code for the float/int cases. Reviewed-by: Donald <qt-info@nokia.com>
| * Fix off by one bug in dfbpe::drawTiledPixmapAnders Bakken2009-07-151-4/+4
| | | | | | | | | | | | | | The drawTiledPixmap code iterated while x < right and y < bottom. This should be x <= right and y <= bottom. Reviewed-by: Donald <qt-info@nokia.com>
| * Add a "User-Agent" line to our HTTP proxy requests.Thiago Macieira2009-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently some proxy servers can be configured to deny requests based on User-Agent, even for CONNECT connections. See https://bugs.kde.org/show_bug.cgi?id=155707#c155 for an example (packet dump in #c157, analysis in #c158). So send a User-Agent header with value "Mozilla/5.0", hoping that this will be enough to allow the connection. I hope it will, because other tools like libtool send something completely different: User-Agent: curl/7.19.5 (i586-mandriva-linux-gnu) libcurl/7.19.5 GnuTLS/2.8.1 zlib/1.2.3 c-ares/1.6.0 libidn/1.15 libssh2/1.0 Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-10-26 14:21:41 (GMT)