summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-02384-7206/+24094
|\ | | | | | | | | | | | | | | | | | | | | master's version of conflicting def files picked. Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-018-30/+147
| |\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGtkStyle: Don't create new GtkAdjustment objects on every draw Designer: Fix coverity warning (memory leak in widget database). Fix license headers
| | * QGtkStyle: Don't create new GtkAdjustment objects on every drawAndreas Kling2010-12-013-15/+51
| | | | | | | | | | | | | | | | | | | | | Use gtk_*_get_adjustment() and gtk_adjustment_configure() to re-use the previously set GtkAdjustment on GtkProgress and GtkRange. Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| | * Designer: Fix coverity warning (memory leak in widget database).Friedemann Kleint2010-12-011-5/+5
| | | | | | | | | | | | | | | Reviewed-by: Juuso Pakarinen <juuso.pakarinen@tieto.com> Task-number: QT-4341
| | * Fix license headersJason McDonald2010-12-014-10/+91
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-304-41/+47
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: avoid the warning about comparison between signed and unsigned integers QRasterPixmapData: Reuse underlying QImage in fill() if possible.
| | * avoid the warning about comparison between signed and unsigned integersKonstantin Ritt2010-11-301-1/+1
| | | | | | | | | | | | | | | Merge-request: 951 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * QRasterPixmapData: Reuse underlying QImage in fill() if possible.Andreas Kling2010-11-303-40/+46
| |/ | | | | | | | | | | | | | | | | | | | | | | When switching from a format without alpha channel to one that has it, reuse the underlying QImage memory if the old & new color depths match. This avoids one allocation when using the rather common pattern: QPixmap pixmap(w, h); pixmap.fill(Qt::transparent); Reviewed-by: Samuel Rødal
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-307-25/+489
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file freeze
| | * DEF file freezemread2010-11-297-25/+489
| | | | | | | | | | | | | | | | | | | | | Updating the DEF files on master as there's quite a few new exports since they were last frozen. Reviewed-by: Shane Kearns
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-294-27/+90
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: minor optimization: decrease amount of possible detaches to 1 add reminders for Qt 5.0 add QChar::currentUnicodeVersion() static member make the ArabicShaping parser a bit stricter fix a typo in the code range define a constant for the expected Properties struct size
| | * minor optimization: decrease amount of possible detaches to 1Konstantin Ritt2010-11-291-6/+10
| | | | | | | | | | | | | | | Merge-request: 2503 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * add reminders for Qt 5.0Konstantin Ritt2010-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * QChar::NoCategory is a `fake` category since there is no relevant equivalence for it in the Unicode specs; the default category for invalid/unassigned codepoints is QChar::Other_NotAssigned. QChar::NoCategory already caused some troubles in the past, so let's remember that lesson and do not repeat this mistake anymore; * QChar::Unicode_Unassigned == 0 and thus it is less than any other QChar::UnicodeVersion value that makes test for unassigned (in some Unicode version) codepoints a bit more complex (eg `if (v == QChar::Unicode_Unassigned || v > QChar::Unicode_3_1)` to check if some codepoint is unassigned for Unicode 3.1); * QChar::Punctuation_Dask was just a typo. Merge-request: 947 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * add QChar::currentUnicodeVersion() static memberRitt Konstantin2010-11-292-0/+11
| | | | | | | | | | | | | | | Merge-request: 2482 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * make the ArabicShaping parser a bit stricterKonstantin Ritt2010-11-291-13/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | warn and halt if unassigned or unhandled joining value was met. this doesn't affect on the generated tables but makes the upgrading to the newer UCD versions a bit easier but safer in general. Merge-request: 946 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * fix a typo in the code rangeKonstantin Ritt2010-11-291-3/+7
| | | | | | | | | | | | | | | | | | | | | and add the curly braces to satisfy the coding style Merge-request: 946 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * define a constant for the expected Properties struct sizeKonstantin Ritt2010-11-291-2/+3
| | | | | | | | | | | | | | | Merge-request: 946 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-281-3/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Rename File > Quit to Exit on Windows.
| | * Rename File > Quit to Exit on Windows.Thiago Macieira2010-11-281-3/+9
| |/ | | | | | | Task: QTBUG-15676
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Corrected case on Symbian library.
| | * Corrected case on Symbian library.axis2010-11-261-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-265-43/+85
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: gdb_dwarf_index: change version constraint from 72 to 73 Revert "Remove gdb_dwarf_index from maemo mkspec" Line ending fix. Added mipmap property to QGLFramebufferObjectFormat. Remove gdb_dwarf_index from maemo mkspec
| | * | gdb_dwarf_index: change version constraint from 72 to 73Arvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | We previously made the false assumption that gdb 7.2 matches sourceware master (which claims to be 7.2, but really is 7.3)
| | * | Revert "Remove gdb_dwarf_index from maemo mkspec"Arvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | | | | | | | | | This reverts commit 7643d1016a6b4776cf671bbc595ec83002d2cc4e.
| | * | Line ending fix.Kim Motoyoshi Kalland2010-11-261-35/+35
| | | |
| | * | Added mipmap property to QGLFramebufferObjectFormat.Kim Motoyoshi Kalland2010-11-263-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the mipmap property is set, QGLFramebufferObject will allocate memory for mipmap levels. Reviewed-by: Gunnar
| | * | Remove gdb_dwarf_index from maemo mkspecArvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | | | | | | | | | maemo6 has gdb7.2 but not gdb-index
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-264-123/+103
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFileSystemWatcher: don't try to stop non-running thread Fix QSettings auto test to use QTRY_VERIFY tst_QFileSystemWatcher: Don't exit the event loop on first signal. QPollingFileSystemWatcherEngine: Fix double report of directory change. QKqueueFileSystemWatcherEngine: Use higher file descriptors. QKqueueFileSystemWatcherEngine: Unlock mutex between two events. QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2). QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR. QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close(). QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.
| | * | QFileSystemWatcher: don't try to stop non-running threadJoão Abecasis2010-11-262-0/+3
| | | | | | | | | | | | | | | | | | | | Task-Number: QTBUG-14435 Reviewed-by: Bradley T. Hughes
| | * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | ... instead of relying on qApp->processEvents. Reviewed-by: Olivier Goffart
| | * | tst_QFileSystemWatcher: Don't exit the event loop on first signal.Tijl Coosemans2010-11-261-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes tests can produce more than one signal and other times more than one signal would be an error. In order to test this the event loop should run long enough and not quit on the first signal. This is especially important on multicore systems where the application and worker threads run on different CPUs. Signals emitted by the worker thread are then almost immediately processed by the application thread. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QPollingFileSystemWatcherEngine: Fix double report of directory change.Tijl Coosemans2010-11-261-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The polling engine first retrieves a QFileInfo for a given path, then tests whether it's different from before and if so, stores the new file info and emits a signal. In case path is a directory the test also checks if the list of directory entries has changed. This creates a window between retrieving the file info and the test in which a file can be added/removed from the directory or the directory itself can be removed. In that case the test returns true, because the list of entries has changed, but outdated file info is stored which means that on the next timeout the same change will be reported a second time. Therefore, refresh the file info after the test for changes. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Use higher file descriptors.Tijl Coosemans2010-11-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file descriptor is used for every path to be monitored, but descriptors below FD_SETSIZE (typically 1024) are precious, for use with select(2). To allow the application (and other parts of Qt) to use select(2), try to duplicate the descriptor returned by open(2) above FD_SETSIZE and close(2) the original. However, only do so when the descriptor table is already fairly large (FD_SETSIZE / 2). This keeps the descriptor table small for applications that use only a few descriptors. While here, also set the close-on-exec flag on the (new) descriptor. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Unlock mutex between two events.Tijl Coosemans2010-11-261-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the worker thread unlock the mutex between processing two events. Otherwise it's possible for the worker thread to block the application thread when many events occur. Also, there's no need to lock the mutex when processing a pipe event. Generally the worker thread should hamper the application thread as little as possible, so only lock the mutex where needed. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).Tijl Coosemans2010-11-261-65/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to write(2) potentially block, so make sure the application thread unlocks the mutex before it writes to the pipe between itself and the worker thread, so the latter can continue to process events and eventually unblock the write call (if needed) by emptying the pipe. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.Tijl Coosemans2010-11-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The worker thread exits whenever the kevent call returns an error, but in the case of EINTR (interrupted by signal) it should just call kevent again. Otherwise for instance, attaching a debugger to the process causes the worker thread to exit because of the SIGSTOP it receives. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().Tijl Coosemans2010-11-261-13/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.Tijl Coosemans2010-11-261-14/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Using EV_ONESHOT and re-enabling the kevent after emitting the signal allows for a window in which file system changes can go undetected. By using EV_CLEAR instead the kevent can stay enabled. Merge-request: 2425 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-264-9/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix a build break when namespace is defined
| | * Merge remote branch 'qt/master'Jason McDonald2010-11-26260-5583/+20779
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-255-1/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix some memory leaks.
| | * | Fix some memory leaks.Fabien Freling2010-11-255-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the retain/release mechanism for CGContexts. Some leaks were due to unnecessary retain calls. Task-number: QTBUG-15373 Reviewed-by: Samuel Rødal
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-256-4/+95
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix performance penalty in Win32MakefileGenerator::findHighestVersion Allow QDial to wrap value when wrapping property is set. QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)
| | * | | fix performance penalty in Win32MakefileGenerator::findHighestVersionJoerg Bornemann2010-11-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't scan Qt's lib dir over and over again. Task-number: QTBUG-15595 Reviewed-by: ossi
| | * | | Allow QDial to wrap value when wrapping property is set.Andy Nichols2010-11-253-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDial's wrapping property allows for 360 degree revolutions when using the mouse. However whenever using the keyboard Up/Down/PageUp/PageDown keys the QDial's value will stop at the minimum and maximum values. This has been fixed to allow the bounds checker to account for the wrapping property. Merge-request: 2437 Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
| | * | | QtScript variant conversion: Convert numbers to (u)int if applicable ↵Thomas Senyk2010-11-252-1/+7
| | | | | | | | | | | | | | | | | | | | (reviewed by khansen)
| * | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-25292-6035/+21775
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (102 commits) fix inf loop bug Enable the no-undefined flag on the linker for icc Fixed tst_qwidget::winIdChangeEvent Prevent compilers optimizing eval timebomb code out of existence. Fix incorrect example for Qt.rgba() Flickable and MouseArea were too eager to take/keep mouse grab. Allow javascript date and regexp objects in WorkerScript messages Fix compliation of ALSA audio backend when checking for surround support. Avoid lockup in ListView when animating delegates. Fix asynchronous reload call in test, broken by previous submit Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Update QtGui emulator def file for bug QT-3971 Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Ignore .pc/ Ensure WebView press delay timer is cancelled when grab is taken. Prevent crash when calling reload() from within a .qml Doc: Fixing typo ...
| | * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-252-0/+8
| | |\ \ \
| | | * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-11-252-0/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fix compliation of ALSA audio backend when checking for surround support.
| | | | * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-11-252-0/+8
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fix compliation of ALSA audio backend when checking for surround support.
generated by cgit v0.12 at 2024-11-07 16:01:53 (GMT)