summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update contact URL in license headers.Jason McDonald2009-08-127624-7766/+7765
| | | | Reviewed-by: Trust Me
* Update stale license headers.Jason McDonald2009-08-124-24/+140
| | | | Reviewed-by: Trust Me
* QMenuBar does not respect the border-image stylesheet propertyGabriel de Dietrich2009-08-111-1/+16
| | | | | | | | | | | Added WA_StyledBackground to QMenuBar when using style sheets. This also implies that CE_PanelMenuBar (drawing only the menubar border) no longer needs to be drawn. Tested in uiloader/baselne/css_borderimage_allwidgets.ui. Task-number: 230363 Reviewed-by: olivier
* Update the css_borderimage test to test the menubar as wellOlivier Goffart2009-08-111-181/+218
| | | | | | | The menu bar is currently broken with border-image, fix is about to be commited Task-number: 230363
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-1117-192/+278
|\
| * Optimize qt_format_text test operations: try not to detachOswald Buddenhagen2009-08-111-40/+28
| | | | | | | | Reviewed-by: Oswald Buddenhagen
| * Change QFontMetrics::width to return the width of the longest variant if the ↵Olivier Goffart2009-08-111-2/+4
| | | | | | | | | | | | | | string is a multi-length one Task-number: QT-10 Reviewed-by: Oswald Buddenhagen
| * Make QFontMetrics::elidedText aware of multi-length stringsOlivier Goffart2009-08-112-5/+42
| | | | | | | | | | Reviewed-by: Oswald Buddenhagen Task-number: QT-10
| * Add the Qt::TextLongestVariant flag so QFontMetrics::size returns the size ↵Olivier Goffart2009-08-114-3/+6
| | | | | | | | | | | | | | | | | | of the biggest string In case the strings contains multiple strings separated by \x9c Reviewed-by: Oswald Buddenhagen Task-number: QT-10
| * Handle multi-length strings in the low-level formatting codeOlivier Goffart2009-08-111-13/+21
| | | | | | | | | | | | | | | | | | | | | | Patch originally from Oswald on Jira QT-10, with few a modifications. If a string contains multiple variants sorted by decreasing length, separated by \x9c, it will try to paint the longest variant which fits into the bounding box. Reviewed-by: Oswald Buddenhagen Task-Number: QT-10
| * code clean-up and style fixesRitt Konstantin2009-08-116-37/+25
| | | | | | | | | | | | | | | | | | remove unused includes; tabs -> whitespaces; clean extra whitespaces Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * merge nativeAbsoluteFilePath and nativeAbsoluteFilePathCoreRitt Konstantin2009-08-111-11/+5
| | | | | | | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * optimize inlines in QFSFileEngineRitt Konstantin2009-08-112-7/+7
| | | | | | | | | | | | | | | | un-inline isDirPath() since it too large for this (reduce size of QtCore binary in a few kilobytes) Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * minor optimizationsRitt Konstantin2009-08-111-10/+3
| | | | | | | | | | | | | | | | -in most cases GetFullPathName returns string with at least path.size() chars; -". " isn't valid path; ". " isn't valid path too...should we to pay more? Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * optimize longFileName() a bitRitt Konstantin2009-08-111-5/+6
| | | | | | | | | | | | | | | | | | | | isUncPath() is always called with native separator-ed paths, so we can avoid needless comparisons; don't declare isUncPath() under CE since it never used Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * don't mix link's target's permissions with link's Exe*Perm bitsRitt Konstantin2009-08-111-1/+2
| | | | | | | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * don't mix calculated and forced permission bitsRitt Konstantin2009-08-111-14/+14
| | | | | | | | | | | | | | this commit just moves closing bracket to the function end Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * move dubbed code into static funtionRitt Konstantin2009-08-111-4/+10
| | | | | | | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * QFSFileEngine must set LocalDiskFlag regardless file exists or notRitt Konstantin2009-08-112-2/+29
| | | | | | | | | | | | | | | | LocalDiskFlag actually means "Local File Engine" and can be effectively used for testing file path for target storage type (local/network/virtual and so on) Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * '.' and '..' must not be hiddenRitt Konstantin2009-08-113-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _unix code always sets HiddenFlag for special dirs which is wrong; also there is some inconsistence under win: * FindFirstFile sets FILE_ATTRIBUTE_HIDDEN flag for ".." of hidden dir *even* if parent dir is not hidden; * GetFileAttributes sets FILE_ATTRIBUTE_HIDDEN flag for ".." *only* if parent dir is hidden. so, _win part sets HiddenFlag wrong too; finally, we never test parent dir's flags; futhermore hidden special dirs (dotAndDotDot) makes dir iterator's filtering a bit more complex Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * avoid crash when testing HiddenFlag and BaseName is emptyRitt Konstantin2009-08-112-1/+5
| | | | | | | | | | Merge-request: 1176 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * 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
* | Doc: Fixed code snippets in QReadLocker and QWriteLocker documentation.David Boddie2009-08-111-4/+4
|/ | | | Reviewed-by: Trust Me
* 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
View Lorry Controller Status