summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avoid needless const_cast-sRitt Konstantin2009-08-111-9/+10
| | | | | | | | tried_stat, could_stat, need_lstat, and is_link are members marked as mutable; prefer mutable over const_cast Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
* replace QFile::exists() by QT_STAT() respectivelyRitt Konstantin2009-08-111-3/+7
| | | | | | | which is a bit faster since it doesn't creates new file engine instance Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
* micro-optimization in QFSFileEngine::mkdirRitt Konstantin2009-08-111-3/+3
| | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
* don't set FileType flag when link's target doesn't existsRitt Konstantin2009-08-111-3/+4
| | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
* QFSFileEngine::mkdir fix on WindowsRitt Konstantin2009-08-111-2/+6
| | | | | | | | | This function now returns early if a non-directory is met in the path. Something like /foo/bar/&&/ will bail out early. Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
* fix tst_QPixmapCache::clear for Windows CEJoerg Bornemann2009-08-111-6/+11
| | | | | | This test used too much memory for Windows CE <= 5. Reviewed-by: thartman
* fix QTextFormat::doubleProperty where qreal is floatJoerg Bornemann2009-08-111-3/+4
| | | | | | | | This function was too strict. It returned 0 if the property wasn't of type QVariant::Double. Now it tests for QMetaType::Float too. Reviewed-by: kh1 Reviewed-by: mauricek
* QPoint comparision operators use qFuzzyIsNull instead of qFuzzyCompareJoerg Bornemann2009-08-111-2/+2
| | | | | | | | qFuzzyCompare doesn't support 0 as parameter. So this function is pretty useless for QPoint, where coordinates can be zero. Reviewed-by: Harald Fernengel
* fix warnings for the qreal == float caseJoerg Bornemann2009-08-112-11/+11
| | | | Reviewed-by: mauricek
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-11121-3504/+9701
|\
| * QWidget::isHidden documentation clarification.Jocelyn Turcotte2009-08-111-3/+6
| | | | | | | | Reviewed-by: Kavindra
| * QDateTimeEdit: setFrame property is respected when a popup calendarMatthew Cattell2009-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | has been set. The hasFrame() or frame property of the QStyleOptionSpinBox was not being copiedthrough to the QStyleOptionComboBox inside the paintEvent method if a calendarPopup had been enabled. Task-number:259510 Reviewed-by:Jens Bache-Wiig
| * Make QFileInfo::isSymlink() work for symlinks on WindowsAndy Shaw2009-08-111-0/+2
| | | | | | | | | | | | | | This feature on Windows was added in Windows 2000, but its not so easy to utilize until at least Vista was released. Reviewed-by: Marius Storm-Olsen
| * Merge commit 'remotes/wm65/wm65'Thomas Hartmann2009-08-113-368/+4127
| |\
| | * Cleanup of Windows Mobile StyleThomas Hartmann2009-08-111-76/+61
| | | | | | | | | | | | Reviewed-by: Maurice
| | * activate wm65 style only for wm65Thomas Hartmann2009-08-111-1/+1
| | |
| | * adding qt_wince_is_windows_mobile_65()Thomas Hartmann2009-08-111-0/+25
| | |
| | * using proxy()Thomas Hartmann2009-08-111-103/+103
| | |
| | * Adding Windows Mobile 6.5 styleThomas Hartmann2009-08-112-271/+4020
| | |
| * | Merge commit 'remotes/wm65/wm65'Thomas Hartmann2009-08-111-0/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/dialogs/qfiledialog_win.cpp
| | * Fixes build for Windows MobileThomas Hartmann2009-07-201-1/+0
| | | | | | | | | | | | Reviewed-by: Joerg
| * | Fixed uploading of glyphs to the glyph cache in the GL2 engine.Kim Motoyoshi Kalland2009-08-111-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | Upload the glyph one scanline at a time to work around what probably is a driver bug. This replaces a previous fix 6d0290b2202d4fc084595ba678c2a2d984392e72. Reviewed-by: Tom
| * | 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