summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-10-2660-376/+10966
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (29 commits) Fix possible crash in glyph cache when deleting and creating contexts Added Lithuanian translation of Qt. Remove idc from mingw build. Update changelog for Qt 4.8 Update changelog for Qt 4.8 Add the ability to enable various SSL bug workarounds. Fix performance regression on Mac OS X when creating/destroying QMutex Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Symbian - Change working directory of applications in ROM QtGui def file update Show SaxBookmarks as maximized in Symbian Early construction of status pane and softkeys for Symbian boosted apps Maximized dialogs are incorrectly positioned after layout switch Fix bug in QStringToBSTR. Fix regression in ListView Fixed resource leak when setting QProgressBar style sheet Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac don't lock the global mutex if there is nothing to protect fix possible race conditions simplify the code by using QSystemLibrary a bit smarter ...
| * Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-10-2657-375/+10951
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-10-2531-248/+353
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix bug in QStringToBSTR. Fix regression in ListView Fixed resource leak when setting QProgressBar style sheet Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac don't lock the global mutex if there is nothing to protect fix possible race conditions simplify the code by using QSystemLibrary a bit smarter use QSystemLibrary::resolve() instead of GetProcAddress() win API calls nativewifi bearer plugin: prefer DLL Safe Search mode make QElapsedTimer use QSystemLibrary on win QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth() Fix bug in QGraphicsItem::isVisibleTo(). nano-opts, styling fixes don't assume the PATH envvar is latin1-encoded Set missing flags in the option when rendering QTreeView drag pixmap Fix typo when updating accessible treeview selection.
| | | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-241-0/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Update changelog for Qt 4.8
| | | | * Merge branch '4.8-upstream' into master-waterWater-Team2011-10-241-0/+3
| | | | |\
| | | * | \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-2223-125/+338
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Add the ability to enable various SSL bug workarounds. Fix performance regression on Mac OS X when creating/destroying QMutex Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Symbian - Change working directory of applications in ROM QtGui def file update Show SaxBookmarks as maximized in Symbian Early construction of status pane and softkeys for Symbian boosted apps Maximized dialogs are incorrectly positioned after layout switch
| | | | * | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2213-66/+240
| | | | |\ \
| | | | * \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2010-59/+98
| | | | |\ \ \
| | | * | \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-1887-641/+2606
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (40 commits) Update Japanese translations. Updated Russian translation Update Korean translations to 4.8 qmake: fix writing of incremental linker option for vcxproj files runonphone timestamps nanosecond formating set to 9 chars, 0 padded Put Qt translation files to rom on Symbian. Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian Converting from double to qreal in gui Doc updates to installation, platform notes and symbian introduction. Fix XML schema validation failure. Fix construction races in QtNetwork Removing accidental use of double instead of qreal from QLine Fix incorrect QFileInfo permissions on windows Converting accidental use of doubles to qreal in declarative Copy and Cut are not available for some QML editors Ignore CcpuCan calls if input context is being destroyed Remove one local variable from QCoeFepInputContext Symbian: Fix native dialog with splitscreen VKB focus loss issue Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication ...
| | | | * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-188-145/+1548
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-1779-496/+1058
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-151-1/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: support the obj-c #import statement in the dependency generator
| | | | * | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-151-1/+2
| | | | |\ \ \ \ \ \
| | | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-14303-398/+576
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Update 4.8.0 changelog Changelog: update changes-4.8.0 for Richard Add briefs for the new 4.8 examples. Add briefs to the new 4.8 demos. Add a brief to all demos and examples for manifest
| | | | * | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-14303-398/+576
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-141-8/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix bug in QStringToBSTR.
| | | | * | | | | | | | Fix bug in QStringToBSTR.Jan-Arve Saether2011-10-141-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same implementation as found in ActiveQt, which Volker suggested. Task-number: QTBUG-11083
| | | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-137-201/+1426
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix regression in ListView Add -nn for .cpp MOC preprocessing for INTEGRITY Remove commented out code. Update Polish translations for 4.8
| | | | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-136-197/+1422
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix regression in ListViewJens Bache-Wiig2011-10-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d91a8f3a5dbcf3e4c4c0afb28463b25e192b00e4 and introduces a minimal fix for the original crash report. Task-number: QTBUG-21433 Reviewed-by: gabriel
| | | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-108-19/+49
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fixes: libpng symbols exported from QtGui.dll on Windows omit unassigned (and too recent codepoints) from the text Normalization process Fixed broken window surface flush when depth is 24 and bpp is not 32.
| | | | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-108-19/+49
| | | | |\ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-101-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fixed resource leak when setting QProgressBar style sheet
| | | | * | | | | | | | | | Fixed resource leak when setting QProgressBar style sheetTero Ahola2011-10-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19110 Merge-request: 2687 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-1050-308/+789
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (32 commits) Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac don't lock the global mutex if there is nothing to protect fix possible race conditions simplify the code by using QSystemLibrary a bit smarter use QSystemLibrary::resolve() instead of GetProcAddress() win API calls nativewifi bearer plugin: prefer DLL Safe Search mode make QElapsedTimer use QSystemLibrary on win purge "Translation Rules for Plurals" add -list-languages option to lupdate Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask) QHostInfo: fix a race condition under CE Do not let QGLContext get out of sync when doing mixed VG-GL rendering Doc updates to "Installing Qt for the Symbian Platform" page. Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication symbian - add support for ELangKazakh and ELangEnglish_India QAuthenticator::setUser() parse user name in form user@domain A patch for 'Fix to QtOpenGL crash' Update Korean Translations Document updates to Qt for Symbian installation instructions and platform notes. ...
| | | | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-1037-139/+671
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0737-139/+671
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85acJan-Arve Saether2011-10-101-1/+1
| | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trustme
| | | | * | | | | | | | | | | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-074-48/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to Thiago, setting the pointer with the same values *is* thread-safe Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | fix possible race conditionsKonstantin Ritt2011-10-0715-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | simplify the code by using QSystemLibrary a bit smarterKonstantin Ritt2011-10-073-40/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-073-37/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes the code more consistent with similar parts and a bit more readable Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | nativewifi bearer plugin: prefer DLL Safe Search modeKonstantin Ritt2011-10-071-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by using QSystemLibrary instead of QLibrary Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | make QElapsedTimer use QSystemLibrary on winKonstantin Ritt2011-10-071-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we also need to ensure the counterFrequency was already set up, thus volatile (which fixes possible race condition) Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-064-18/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Ukrainian translation updated Build fix for WINCE to qfilesystemengine_win.cpp Fixed typo in QSettings documentation. remove dead code
| | | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-064-18/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-0551-431/+995
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (25 commits) Added Qt Quick Components link to document add integrity gbuild to the project file for convenience don't build activeqt examples on mingw QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined. Updated Russian translation QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs Ukrainian translation updated for 4.8 retreving -> retrieving Fix assert Removed duplicate Spectrum Analyzer entry from demos doc page. Removed obsolete QWS_ALPHA_CURSOR feature. Removed duplicate link from QFinalState documentation. Clarified keypad navigation specific event documentation. docs: Typo and link fixes. Use the right callback in QObject::disconnect() Compile fix for Symbian Debugger: Fix autotest breakage Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug* Rename QDeclarativeEngineDebugServer to ~Service Fix aliasing bug when compiled with gcc 4.6 ...
| | | | * | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-052-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0449-431/+993
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-045-57/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth() QNetworkRequest autotest: adapt to new cookie parsing (re. commas) Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.
| | | | * | | | | | | | | | | | | | QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth()Mikko Knuutila2011-10-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cursor's width is now queried from the style only when the user calls cursorWidth(). Earlier it was queried already in the ctor, which caused crashes if the application was guiless. Merge-request: 2697 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-0410-62/+224
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-10-0322-108/+340
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Added text about -random and -seed options in QTest to changelog Add another part of the source code to the snippet. Fix bug in QGraphicsItem::isVisibleTo(). nano-opts, styling fixes don't assume the PATH envvar is latin1-encoded Update changes-4.8.0 Update translation sources. Set missing flags in the option when rendering QTreeView drag pixmap Update the changelog for qdoc in 4.8 Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Fix possible crash in QFontEngineFT Doc updates to platform notes of Qt 4.8 doc. Doc updates to Qt 4.8 platform notes documentation.
| | | | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0311-11/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-292-36/+93
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Fix bug in QGraphicsItem::isVisibleTo().Andreas Aardal Hanssen2011-09-292-9/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21612 Reviewed-by: James Perrett Reviewed-by: Magne Pettersen Zachrisen Merge-request: 1396 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | | | | | | | nano-opts, styling fixesKonstantin Ritt2011-09-292-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1344 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | | | | | | | don't assume the PATH envvar is latin1-encodedKonstantin Ritt2011-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use Unicode getenv() version instead Merge-request: 1344 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | | | * | | | | | | | | | | | | | | | | Set missing flags in the option when rendering QTreeView drag pixmapDavid Faure2011-09-295-40/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemViewPrivate::renderToPixmap was not setting all the flags that the normal QTreeView painting sets: option.showDecorationSelected, option.viewItemPosition (so the drag pixmap looked wrong on Windows 7, with rects around each cell), and then the unittest also discovered that State_Children/State_Sibling wasn't set either. Task-number: QTBUG-15834 Merge-request: 2517 Reviewed-by: Gabriel
| | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix typo when updating accessible treeview selection.