summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotests refactoringJedrzej Nowacki2009-08-121-94/+329
| | | | | Many tests were divided into smaller pieces. Some XFAIL added. Small improvements.
* Move JSC::Debugger's events calls from JSC::evaluate() toJedrzej Nowacki2009-08-122-24/+31
| | | | | | | QSCriptEngine::evaluate() Fix broken behavior after bad integration with 538153994cacc4613aef1eb8ef77e501be7f5a88 commit
* Crash fix.Jedrzej Nowacki2009-08-121-1/+2
| | | | | | Fix GetSetAgent() in tst_qscriptengine. Reviewed-by: TrustMe
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-127842-15324/+22145
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: configure src/script/qscriptarray_p.h src/script/qscriptasm.cpp src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata.cpp src/script/qscriptclassdata_p.h src/script/qscriptclassinfo_p.h src/script/qscriptclasspropertyiterator_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptcontextinfo_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmaboolean_p.h src/script/qscriptecmacore.cpp src/script/qscriptecmacore_p.h src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptengineagent_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptextvariant_p.h src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptglobals_p.h src/script/qscriptmember_p.h src/script/qscriptnameid_p.h src/script/qscriptnodepool_p.h src/script/qscriptobject_p.h src/script/qscriptobjectfwd_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvaluefwd_p.h src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptvalueiteratorimpl_p.h
| * Possible Dead lock in the destructor of QObjectThierry Bastian2009-08-124-13/+29
| | | | | | | | | | | | | | | | | | | | | | The problem was that we were locking a mutex that was global to thread to remove posted events associated with a QObject from the posted event list. We were also immediately deleting those events. If that triggers the deletion of another QObject, you would then trigger a dead-lock. Task-number: 259514 Reviewed-by: brad Reviewed-by: ogoffart
| * Phonon: On windows, cross fading was brokenThierry Bastian2009-08-121-1/+2
| |
| * usage of Q_OS_WINCE fixedJoerg Bornemann2009-08-121-2/+2
| | | | | | | | | | | | There's no QT_OS_WINCE define. Reviewed-by: mauricek
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-12103-108/+107
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-08-124-7/+10
| |\
| | * Compile fix for Windows CE standard SDKThomas Hartmann2009-08-122-6/+8
| | | | | | | | | | | | | | | | | | Q_WS_SINCE_WM ifdefs were broken Reviewed-by: Joerg
| | * Surrounded a string const with QString() to get snippet to work.Martin Smith2009-08-122-1/+2
| | | | | | | | | | | | Task-number: 258967
| * | Replace obsolete license headers.Jason McDonald2009-08-1255-1706/+1705
| |/ | | | | | | Reviewed-by: Trust Me
| * Update obsolete email addresses.Jason McDonald2009-08-12368-615/+615
| | | | | | | | Reviewed-by: Trust Me
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-1251-398/+391
| | | | | | | | Reviewed-by: Trust Me
| * Update obsolete URL's in code and docs.Jason McDonald2009-08-12119-219/+219
| | | | | | | | Reviewed-by: Trust Me
| * Update references to online documentation.Jason McDonald2009-08-1252-84/+84
| | | | | | | | Reviewed-by: Trust Me
| * Eliminate last mentions of "Qt Software".Jason McDonald2009-08-1276-77/+77
| | | | | | | | Reviewed-by: Trust Me
| * Update URL's to use new domain.Jason McDonald2009-08-12125-376/+370
| | | | | | | | Reviewed-by: Trust Me
| * 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
| |\