summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Phonon: avoids assert when switching sourceThierry Bastian2009-08-111-0/+2
| | | | | The problem was that when switching source, the previous one was still running. So we now explicitly stop it.
* Allow make utilities other than "make"Harald Fernengel2009-08-117-13/+15
| | | | | | | Instead of hard coding "make", use "$MAKE". If $MAKE is not set, configure will export it for us when searching for "make". Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Phonon::VideoWidget still flickeringThierry Bastian2009-08-111-0/+2
| | | | | | | small patch to make sure even the native events of the pending ones won't trigger anything in the paintevent Task-number: 251776
* Wrote an autotest to expose a bug in the GLib event dispatcher.axis2009-08-111-1/+15
| | | | | | | | | | | Zero timers don't fire on the first pass in the GLib event dispatcher. Ideally I should fix the bug of course, but time doesn't permit at the moment. Submitting this test instead as a "reminder". The UNIX event dispatcher passes the test, and it also passes if moved to the end of the slots. Task: 259505
* Fix Whitespace errorsPrasanth Ullattil2009-08-112-29/+29
| | | | Reviewed-by: Trust Me
* Fix compile error on 64BitPrasanth Ullattil2009-08-112-0/+34
| | | | | | Added new overload with int64 parameter. Reviewed-by: Simon Hausmann
* Add support for hooking BeginPaint/EndPaint on 64Bit WindowsPrasanth Ullattil2009-08-113-2/+111
| | | | | | | | | | Webkit uses the runtime patching trick explained by "Feng Yuan" for hooking these paint functions. It currently supports only 32bit assembly code. This patch adds support for 64Bit version. Since inline-assemblies are not supported for 64Bit, we have use a seperate .asm file. Reviewed-by: Simon Hausmann Reviewed-by: Thiago Macieira
* Remove trailing whitespaceKavindra Devi Palaraja2009-08-111-4/+3
| | | | Reviewed-By: TrustMe
* Doc - Some documentation fixes for Model View documentation together withKavindra Devi Palaraja2009-08-111-94/+126
| | | | | | | | | some clarification (Task 229722) on what is a current item, what are selected items, etc. Task: 229722 Reviewed-By: TrustMe
* Phonon: Video widget on Windows flickers when going to next videoThierry Bastian2009-08-111-1/+14
| | | | | | | Now we just disable the updates during a short amount of time. This should give enough time to the video to start. Task-number: 251776
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Sorvig2009-08-112-13/+22
|\
| * Phonon: improve locking to make it safer to load a sourceThierry Bastian2009-08-112-13/+22
| | | | | | | | Task-number: 259482
* | Perform the variable initalizations _before_ starting the clock.Morten Sorvig2009-08-111-2/+2
|/ | | | Removes a few of cycles erronously included in the results.
* Compile.Morten Sorvig2009-08-111-1/+1
|
* Fix BC breakage caused by commit 7aa2d76d.Morten Sorvig2009-08-112-1/+9
| | | | | Code compiled with 4.5 expects to find the QBenchmarkIterationController() constructor, so ad an overload instead of replacing it.
* Merge branch '4.5'Thiago Macieira2009-08-1111-23/+135
|\ | | | | | | | | | | Conflicts: configure tests/auto/moc/tst_moc.cpp
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-2/+2
| | | | | | | | | | | | | | See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix. Reviewed-by: Trust Me (cherry picked from commit 18fbfdf0f774198e2e1277e064cc3a8eb9dbb29d)
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-1/+1
| | | | | | | | | | | | | | "../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray". Reviewed-by: Trust Me (cherry picked from commit 3ae2cab9c8bd1790a00da2755ac036143a3a35f4)
| * xlC 7 cannot compile QtConcurrent with these templates hereThiago Macieira2009-08-071-1/+1
| | | | | | | | (cherry picked from commit cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13)
| * Add functionality tests for XSync.Thiago Macieira2009-08-073-1/+49
| | | | | | | | | | | | | | | | It was reported to be auto-detected, but wasn't. Apparently, AIX 6's X11 doesn't have this. Reviewed-By: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 0a63875d787e1b035ace2c76fa1d0de6329127d7)
| * Autotest: ensure we don't mishandle SSL certificates with NULsThiago Macieira2009-08-072-0/+98
| | | | | | | | | | | | This is a vulnerability in some implementations. Qt isn't affected because... well, we never implemented the decoding of escape sequences :-)
| * Avoid compiling imageformats if you configure with -no-lib*Marius Storm-Olsen2009-08-071-3/+9
| | | | | | | | | | Task-number: 239108 Reviewed-by: Andy Shaw
| * Use QFile instead of QTemporaryFile in compilerwarning testcaseMarius Storm-Olsen2009-08-061-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTemporaryFile on Windows doesn't open the file as a sharable, and doens't close the file when you call .close(). So the testcase fails on Windows with a Sharing Violation when the compiler tries to compile the file. By switching to QFile we can at least close the file before letting the compiler chew on it, and remove it at the end when the testcase is done. Open the file with Truncate, in case the testcase fails to remove the file. Reviewed-by: trustme
| * Fix crash in QX11Data::xdndHandleEnter when XGetWindowProperty failsOctavian Voicu2009-08-061-6/+7
| | | | | | | | | | | | | | Task-number: 259143 Merge-request: 1119 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * Tests: Make uic/uic3 use QLibraryInfo paths as do the linguist tests.Friedemann Kleint2009-08-062-2/+4
| |
| * Mac: fix autotestRichard Moe Gustavsen2009-08-061-1/+1
| | | | | | | | | | | | | | | | On mac, we prefer testing with mp3 rather than ogg, Because in the latter case, you must install perian to make it work. And the test machines dont. Reviewed-by: brad
| * Tests: Make tools tests (rcc/moc/uic/uic3) run without X11-connection.Friedemann Kleint2009-08-064-4/+4
| |
| * Make the test pass by setting a path where you have dirs.Alexis Menard2009-08-061-1/+2
| | | | | | | | | | | | | | | | The test was failing because the goal of the test expect to get only directories displayed. But if you don't have some in the current dir then it fails. home dir should be enough. Reviewed-by:TrustMe
* | QTableView with swapped headers PageUp/PageDown bugGabriel de Dietrich2009-08-112-9/+41
| | | | | | | | | | | | | | | | | | QTableView with header-swapped rows wouldn't scroll correctly when PageUp or PageDown pressed. Simplified calculation for next currentIndex provided in QTableView::moveCursor. Task-number: 259308 Reviewed-by: olivier
* | Updated and purged German translation of Qt Designer.Friedemann Kleint2009-08-111-317/+336
| |
* | Tr-Fixes in Qt Designer.Friedemann Kleint2009-08-113-7/+9
| |
* | Compile QtGui on Linux with no Gtk development package present.Friedemann Kleint2009-08-111-0/+4
| |
* | compile fix for Win32Maurice Kalinowski2009-08-111-1/+1
| | | | | | | | | | | | use correct function pointer (Get) Reviewed-by: Thomas Hartmann
* | Fixes false fails in interbase autotests.Bill King2009-08-113-0/+9
| |
* | Use a linked list for signal/slot ConnectionListAaron Kennedy2009-08-112-39/+86
| | | | | | | | | | | | | | Using a linked list, rather than a QList improves connection performance by eliminating the QList allocation costs. Reviewed-by: brad
* | Make compile.Bill King2009-08-112-0/+2
| |
* | Fixes coverity warning of uninit variable.Bill King2009-08-101-1/+1
| |
* | Doc: Fix links and qdoc warnings.Volker Hilsheimer2009-08-101-3/+3
| |
* | Better implementation for commit d13418effc5f00474541ae513a30c9a42c2a1cb3. TheGabriel de Dietrich2009-08-103-26/+66
| | | | | | | | | | | | previous version could run in an endless loop with infinite models. Reviewed-by: olivier
* | fixing the Windows CE build after adding gesture supportJoerg Bornemann2009-08-101-4/+11
| | | | | | | | | | | | We must guard the code with QT_WINCE_GESTURES. Reviewed-by: TrustMe
* | Add a Widget for manual testing of the tablet APIBenjamin Poulain2009-08-104-0/+204
| | | | | | | | | | The QTabletWidget shows the informations provided by the last QTabletEvent.
* | Make QGtkStyle react properly to font changes in GNOMEJens Bache-Wiig2009-08-103-18/+26
| | | | | | | | | | | | | | | | | | We only reacted to font changes before when the whole theme changed. Two things had to be fixed to support this. We need to check if the font changed in QGtkStyle::updateTheme and we need to make sure that QApplication does not reset these settings for us. Reviewed-by: joao
* | Introducing icon theme supportJens Bache-Wiig2009-08-1042-1295/+3784
| | | | | | | | | | | | | | | | | | | | | | | | Added some static functions to QIcon to support desktop themes based on the freedesktop spec. It is not intended to replace KIcon and the intention is to use it when available to share icon cache between applications. Applications currently using icon themes are Assistant, Designer and the textedit demo. Reviewed-by: ogoffart
* | Manual mergeThomas Hartmann2009-08-101-3/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtThomas Hartmann2009-08-107-29/+37
|\ \
| * | QtWebKit compile fix for Windows CEJoerg Bornemann2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | There's no getenv on Windows CE. Reviewed-By: Simon Hausmann
| * | don't test dbus stuff where no dbus isJoerg Bornemann2009-08-101-2/+2
| | | | | | | | | | | | Reviewed-by: Leo
| * | remove compiler warning for Windows CEJoerg Bornemann2009-08-101-24/+22
| | | | | | | | | | | | | | | | | | whitespaces fixed Reviewed-by: TrustMe
| * | respect QAbstractSpinBox::NoButtons in windowsce / windowsmobile stylesJoerg Bornemann2009-08-102-1/+9
| | | | | | | | | | | | | | | | | | | | | Code is adapted from QCommonStyle which handles this case for other styles. Reviewed-by: thartman
| * | tst_QSharedPointer fixed for Windows CEJoerg Bornemann2009-08-101-0/+2
| | | | | | | | | | | | | | | | | | We cannot create too many threads on Windows CE. Reviewed-By: thartman