summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change file update for compressed texture support.Rhys Weatherley2009-12-061-4/+9
|
* Compressed texture binding for QtOpenGL: ETC1 and PVRTCRhys Weatherley2009-12-065-118/+461
| | | | | | | | | | | | | | | | The QGLContext::bindTexture(QString) function has been augmented with support for ETC1, PVRTC2, and PVRTC4 compressed textures, in addition to the existing DDS support. The QGLPixmapData class has also been modified to recognize compressed texture formats in fromFile() and fromData(). This change also fixes a bug in bindTexture() that prevented the same compressed texture file from being bound in multiple contexts. There is now a separate file cache for each context group. Task-number: QT-2547 Reviewed-by: Trond
* Fix WA_TranslucentBackground for QGLWidgets on X11/EGLTom Cooksey2009-12-041-45/+73
| | | | | | | Also check for existing QEglContext before creating a new one and leaking a context. Reviewed-by: TrustMe
* Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration()Tom Cooksey2009-12-041-0/+9
| | | | Reviewed-by: Trustme
* Fixes problem with QMenu when it's populated on the aboutToShowPierre Rossi2009-12-045-32/+77
| | | | | | | | | When the menu is populated that late, if the menu is to go off-screen, then it is moved and ends up covering its originating button. Includes some code cleanup thanks to Thierry's tips. Reviewed-by: Gabriel Reviewed-by: Thierry
* Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-0470-231/+746
|\
| * Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-0423-30/+302
| |\
| * | Fixed compile for S60.Rohan McGovern2009-12-041-1/+1
| | | | | | | | | | | | QObjectPrivate::isSignalConnected was inlined, update QtCoreu.def
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0314-54/+106
| |\ \
| | * | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing and releasing the finger/stylus on an editable text widget should only trigger the input method if the release position is still within the widget's boundaries. Reviewed-by: axis
| | * | Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please note: Qt for Maemo5 will already use it in 4.6, while the other platforms will be enabled in 4.7 (otherwise be would break BIC there) This commit adds a so-called placeholder text for line edits. If the widget doesn't have focus and the text() is empty, this placeholder will be shown. (*) also known as hint, click-message or descriptive text Reviewed-by: jasplin
| | * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-03126-602/+1680
| | |\ \
| | * | | really fix mingw+msysOswald Buddenhagen2009-12-022-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i missed the fact that lib2/ was duplicating the magic (totally pointlessly). so now all the magic moved to lib2/, as lib/ is not used on symbian anyway.
| | * | | less bizarre code; fix minor mistakesOswald Buddenhagen2009-12-021-25/+25
| | | | |
| | * | | compile fix for Qt in namespacehjk2009-12-011-0/+4
| | | | |
| | * | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
| | * | | fix for mingw+msysOswald Buddenhagen2009-11-301-5/+9
| | | | |
| | * | | Fix a documentation typo.Christian Kamm2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal
| | * | | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| * | | | Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-022-31/+68
| | |/ / | |/| | | | | | | | | | | | | | Task-number: QTBUG-5298 Reviewed-by: Justin McPherson
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-02105-573/+1492
| |\ \ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0271-455/+1107
| | |\ \ \
| | * | | | Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-012-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac QWidget::destroy() sends an AcceptDropsChange event after clearing the guards for QPointer. This was used to store a QPointer to the widget being deleted & that will never be cleared. The fix removed the setAcceptDrops() from destroy. And as an extra protection make sure designer will not treat that event as interesting. Task-number: QTCREATORBUG-307 Reviewed-by: Denis Dzyubenko Reviewed-by: Friedemann Kleint
| | * | | | Fix regression in tst_QFileSystemWatcherBradley T. Hughes2009-12-011-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dnotify doesn't work on dup'ed file descriptors apparently, so we need to closedir() before using fcntl() to set the watches. Reviewed-by: TrustMe
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-12-011-3/+4
| | |\ \ \ \
| | | * | | | Re-enabled realpath() on symbian.Denis Dzyubenko2009-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was disabled by accident when we were disabling it for Mac. Reviewed-by: Prasanth
| | | * | | | Fix a crash in QFSFileEnginePrivate::canonicalized() on Mac OS X 10.5Prasanth Ullattil2009-12-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The realpath() extension we use in this function is only available from 10.6 onwards. For the time being this optimization is turned off on Mac. Reviewed-by: Markus Goetz
| | * | | | | Make sure file descriptors are valid in the dnotify implementation of ↵Bradley T. Hughes2009-12-011-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileSystemWatcher Commit 71c3227ba260b964b0c9516f05ad4f2e6fa72f69 fixed a memory leak by calling closedir(), which would also close the file descriptor we were wanting to watch. Fix this by duplicating the file descriptor that we store. Reviewed-by: TrustMe
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-3016-43/+129
| | |\ \ \ \
| | | * | | | Fixes a crash on Mac with QFileInfo.Denis Dzyubenko2009-11-302-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | realpath() crashes on mac if the input file path is the root ("/") - on 10.6 calling a free on the returned value shows a warning saying the memory was not allocated. To workaround that just added a special case - if the input string is '/', we don't need to use realpath as we already know that the path is canonical. Reviewed-by: Prasanth
| | | * | | | Unix: Avoid stat() when opening a fileMarkus Goetz2009-11-302-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The open() syscall can open directories for reading, which we in QFile and file engines don't support. However, there is no need for stat() to find out if it is a directory if we open() with a write flag because then the syscall will fail anyway. Reviewed-by: joao
| | | * | | | Fix garbage collection issue with script-owned objects with connectionsKent Hansen2009-11-303-23/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reinstates the pre-4.6 behavior: A script-owned C++ object that's not referenced anymore should be garbage collected, even if it has connections. In order to achieve this, the "weak" reference to the C++ object's wrapper must be invalidated. Task-number: QTBUG-6366 Reviewed-by: Simon Hausmann
| | | * | | | Make sure that cleanupTestCase() do not statBenjamin Poulain2009-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The benchmark of QDir is also used to minimize the number of stats(). The test initialization and cleanup should avoid stats(). Reviewed-by: Markus Goetz
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-306-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 9de63cde0ac8aa08e207d4ffce2846df1a44a364 ) Changes in WebKit/qt since the last update:
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-301-1/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Enable YARR when YARR_JIT is enabledKent Hansen2009-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import fix for https://bugs.webkit.org/show_bug.cgi?id=30730 The fix was already applied for src/3rdparty/webkit but not for src/3rdparty/javascriptcore. Task-number: QTBUG-6311 Reviewed-by: Simon Hausmann
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-3077-741/+1168
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-2911-11/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 37d059def88f94e4296a74dc524efda154c6bde6 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-28 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] SoftwareInputPanelRequest event sent when clicking in newly loaded page https://bugs.webkit.org/show_bug.cgi?id=31401 Don't set the event unless there is a focused node we can use for editing afterwards. * Api/qwebpage.cpp: (QWebPagePrivate::handleSoftwareInputPanel): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): 2009-11-23 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. Updated the QWebElement documentation with links to examples and external resources. Fixed the project file for the webelement snippet and tidied up the markers used for quoting the code. * Api/qwebelement.cpp: * docs/webkitsnippets/webelement/main.cpp: (findAll): * docs/webkitsnippets/webelement/webelement.pro: 2009-11-23 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Wrong runtime instance objects of wrapped QObjects may be used if the wrapped object died before the gc removed the instance. https://bugs.webkit.org/show_bug.cgi?id=31681 Added a unit-test to verify that wrapping a QObject with the same identity as a previously but now dead object works. * tests/qwebframe/tst_qwebframe.cpp:
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2966-730/+1021
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-272-0/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | QNetworkReply autotest: adapt to QNetworkCookieJar changePeter Hartmann2009-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with commit 0d20ec8604b318ceafd6c35dfe1d73519bf024d3 I changed QNetworkCookieJar behavior, this commit adapts the QNetworkReply autotest to it. Reviewed-by: TrustMe
| | | * | | | | Fix memory leak in the DNotify implementation of QFileSystemWatcherBradley T. Hughes2009-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that all calls to opendir() are paired with a call closedir(). Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-4840
| | * | | | | | Fix performance regression of posted eventsBradley T. Hughes2009-11-272-29/+40
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 31f1ff91028dd7f90925d5b3737e4d88b5fb07aa introduced a performance regression by using SetTimer() to delay the next call to sendPostedEvents(). SetTimer() has a minimum resolution, around 15-16ms, which is too slow for most uses. Fast timers and QWidget::update() use posted events to do their job, and suffered as a result. This commit goes away from using SetTimer() to using a GetMessage() hook that examines the input queue as soon as message are pulled from the queue. Now there is no large delay between calls to sendPostedEvents(), they are sent as quickly as possible (once all other input and timer messages have been delivered). Reviewed-by: Prasanth Ullattil Task-number: QTBUG-6083
| | * | | | | Improve QFileInfo benchmarkMarkus Goetz2009-11-272-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | Fix miracously exported WTF symbols in QtScript with the Maemo 5 toolchain.Lars Knoll2009-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the WTF namespace. Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-5513 Reviewed-by: Simon Hausmann
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2737-117/+511
| | |\ \ \ \ \
| | * | | | | | On Mac OS X, QLineEdit should handle MoveToStart/EndOfBlockBenjamin Poulain2009-11-263-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, with a QLineEdit, QKeySequence::MoveToStartOfBlock should move the cursor to the beginning of the input, and QKeySequence::MoveToEndOfBlock to the end of the block Same for selection. The shortcuts also had to be updated. Task-number: QTBUG-4679 Reviewed-by: Olivier Goffart
| | * | | | | | Avoid using return value from a temporary objectMarius Storm-Olsen2009-11-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The temporary object goes away before the next line is executed, so the pointer to the const data is invalid. Just put it all on one line, and we're ok. Reviewed-by: Brad
| | * | | | | | create application object in qsdbg exampleKent Hansen2009-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 4.6, it's required that the Q(Core)Application object is constructed before QScriptEngine objects. Reviewed-by: TrustMe
| | * | | | | | rename .qs files to .jsKent Hansen2009-11-266-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtScript _is_ JavaScript, there's no need to use a custom extension. Most of the other examples were already using .js, but there were two files that still had the .qs extension. Agreed with Simon. Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-24 06:42:25 (GMT)