summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-284-2/+65
| | | | (4.7-generated-declarative branch).
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18126-975/+1323
|\ | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-04-184-1/+186
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Fix build for Apple gcc Add platformNativeInterface assessor to QApplication Lighthouse: Add dummy QSessionManager Adapt to different uikit resolutions. Lighthouse: Make directfb conform with ligthhouse gl context api Compile fix for window surface features. (uikit)
| | * Fix build for Apple gcccon2011-04-181-1/+1
| | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| | * Add platformNativeInterface assessor to QApplicationJørgen Lind2011-04-152-0/+12
| | |
| | * Lighthouse: Add dummy QSessionManagerJørgen Lind2011-04-152-1/+174
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-04-1810-73/+88
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits) QLocale: Fixed double to currency string conversion on Mac. Fix qstringbuilder4 test on mac Compile on Mac. Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache" Use the qt_static_metacall in QueuedConnection Fix crash after merge of the native symbian thread branch. Fix bad merge Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5 Removed useless comment SSL code: introduce new error value for blacklisted certificates Disable DEF files by default for symbian-gcce. HTTP caching internals: fix logic for PreferNetwork and PreferCache Added a consistency check for number of missing symbols in elf2e32. Updated def file after symbol removal. QLocalSocket: fix abort on Windows. QStringBuilder: add operator += for QString and QByteArray Dummy commit to trigger pulse. Fix QMetaObject::indexOfSlot Fix compilation Documentation for the initilize_list constructor ...
| | * Merge earth-team into origin/master'Olivier Goffart2011-04-1225-257/+295
| | |\
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-0777-406/+467
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| | * | | Make sure we don't use subpixel positions in full hinting modeJiang Jiang2011-04-013-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the text can start from subpixel positions (start from 100.5 for instance), we need to make sure they stick to pixel grid in this case. Reviewed-by: Eskil (cherry picked from commit bf03b38d2b32a0cfca181398597884e4252466f4)
| | * | | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-013-2/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis
| | * | | Chnaged Q_AUTOTEST_EXPORT marco into Q_GUI_EXPORT for QZipWriter classPavel Mogilevskiy2011-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1162 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> [ Symbols for QZipReader were previously exported with 959ab5d84d67ec84c2342b083e362ca75613e8cb. There's no good reason not to do the same for QZipWriter. Classes remain private API. -- João ]
| | * | | Fix horizontal centered text drawing without word wrapJiang Jiang2011-04-014-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case we can't use line width to align the text, we have to use the rectangle width given in QPainter::drawText for alignment instead. Reviewed-by: Eskil (cherry picked from commit b92a31da01ee50fed4b10282e79f812167faf659)
| | * | | fix order of #include-s on SPARCRitt Konstantin2011-04-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on some systems (i.e. on SPARC), the order of IPC-related includes is meaningful; sys/types.h, then sys/ipc.h, then sys/sem.h, and so on Merge-request: 2586 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | | move semun declaration to qcore_unix_p.hRitt Konstantin2011-04-013-43/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to X/OPEN we have to define semun ourselves but on some systems sem.h will have it, so let's use a prefixed one (qt_semun). this allows to avoid the code duplication and makes things a bit easier to undesrtand Merge-request: 2586 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | | Replace CL_MIN/CL_MAX by qMin/qMaxminiak2011-03-311-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1011 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | | Fix window pixmap initialization strategyJacopo De Simoi2011-03-311-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a compositing manager is active, setting the window pixmap background to None for ARGB windows makes little sense. In this case the background should be transparent Merge-request: 1135 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | | Track compositingManagerRunning changesJacopo De Simoi2011-03-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use XFixes extension to track changes to the compositing manager in such a way that QX11Info::isCompositingManagerRunning() returns a valid result even if compositing has changed after the creation of the QApplication Many thanks to Fredrikh Hoglund for suggesting the correct approach Task-number: QTBUG-6044 Merge-request: 1133 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-3112-234/+315
| | |\ \ \
| | * \ \ \ Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-2858-316/+1816
| | |\ \ \ \
| | * | | | | Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-03-241-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call XTranslateCoordinates anymore, but use the toplevel window offset that we already store to convert between screen coordinates and widget coordinates. Reviewed-by: João Abecasis
| * | | | | | Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-142-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so you will need to use $QTBUILDDIR/bin/syncqt and recompile all applications
| * | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-14138-1149/+2865
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-131-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove a race condition in SIGCHLD handler. Fix warnings about && inside ||
| | | * | | | | | Fix warnings about && inside ||Thiago Macieira2011-04-131-2/+2
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | * | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-134-2/+12
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles Make sure removed QTextBlock is invalid Cocoa: Fixup wrong code in patch baaa5ae
| | | * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-124-2/+12
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-111-1/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: Fixup wrong code in patch baaa5ae
| | | | | * | | | | Cocoa: Fixup wrong code in patch baaa5aeRichard Moe Gustavsen2011-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort of imbarassing, but baaa5ae went in before I checked that the old-behaviour-flag also worked. Which is didn't. This patch will make things good. Task-number: QTBUG-11481 Reviewed-by: jbache
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-113-1/+11
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure removed QTextBlock is invalid
| | | | | * | | | | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-113-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the block is removed from document block map, we will mark the right node to the current head->freelist index, but it shouldn't be accessed directly, otherwise it can cause crash because of uninitialized node. Hence we need to check if a node index is equal to current freelist index. If so, it cannot be a valid block. Task-number: QTBUG-18500 Reviewed-by: Eskil
| | * | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-1148-400/+332
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/qt.iby
| | | * \ \ \ \ \ \ \ \ Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-092-12/+26
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. make -markuntranslated work without -idbased fix conditional on shell type
| | | | * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-092-12/+26
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-091-9/+25
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource
| | | | | | * | | | | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND when a window is maximized or restored via Aero Snap. These messages are now handled correctly. Merge-request: 1105 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-081-3/+1
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Let's not write to the source buffer when blending argb32 on rgb16.
| | | | | | * | | | | | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though we're writing the same values back, we might get a segfault when the source is in read-only memory. Reviewed-by: Kim
| | | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-04-092-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Fix typos in QSharedPointer documentation. Remove test for compiler correctness Refactor qpointer dereference tests Prefer QCOMPARE to QVERIFY for comparisons. Improve coverage of qpointer autotest Add comments, eliminate duplication in qpointer autotest. Remove redundant includes and functions from qpointer autotest. Fix tst_XmlPatterns::xquerySupport() autotest Update copyright year to 2011. BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
| | | | * \ \ \ \ \ \ \ \ \ Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-072-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24239-2800/+9572
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-101203-1204/+1204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-082-15/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Cocoa: p1 bug fix: fix auto test regressions Ensure shared network session deleted from correct thread Revert "Remove SIGBUS emission from QNetworkSession destruction." Image w/ PreserveAspectFit has its width changed once more than needed. Cocoa: p1 bug fix: revert use of subWindowStacking
| | | | * | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-15/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | / / / / / / / / | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-082-15/+34
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: p1 bug fix: fix auto test regressions Cocoa: p1 bug fix: revert use of subWindowStacking
| | | | | | * | | | | | | | | Cocoa: p1 bug fix: fix auto test regressionsRichard Moe Gustavsen2011-04-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref: 32228c4f2b3419a35d1623377050ef72edf73c92 It seems that the change above broke some auto tests, which revealed a true problem. When it comes to modal dialog, children still needs to be stacked on top of modal parents, as they the user cannot use the mouse to raise it. So rather than removing subWindowStacking fully, we narrow it even further down to only be used for children of modal dialogs. All in all, this is close to removing it, but still us it for certain corner cases. Task-number: QTBUG-11481 Reviewed-by: msorvig
| | | | | | * | | | | | | | | Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-062-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c2373d7ea9bc91bb537c0725984d19ad0fbab01. After finding yet another bug related to cocoa child windows (QTBUG-17738), we have no other option than to admit it was a wrong move to use the API in the first place. Had we only known how many side-effects and hidden bugs it would introduce. The original problem we tried to solve were the cases where a stays-on-top parent window executed a modal child dialog. This child should always stay on top of its parent, but Cocoa would insist on pushing the window down to the modal window level upon activating/deactivating the application. Some window systems will always stack a window child on top of the parent, while others (X11) seems to be more selective on this issue. On Mac, we already stack windows a bit differently, thinking first and foremost on tool windows. Since this change is going into a patch release (which is debatable, since this changes behaviour, but p1 is a p1), we choose to add in a backdoor for those users who by chance depend on this behaviour. Setting the env var QT_MAC_USE_CHILDWINDOWS=1 will give you the old code path, but we plan to remove this for Qt-4.8. Also, this patch does fix the original bug described above by overriding the setLevel method in NSWindow, and refuse Cocoa to level down stays-on-top modal windows.
| | | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-075-135/+128
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Avoid compilation warnings on Symbian Get rid of double conversions and arithmetic when qreal is float.
| | | | * | | | | | | | | | | Get rid of double conversions and arithmetic when qreal is float.Samuel Rødal2011-04-065-135/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4624 Reviewed-by: Kim
| | | * | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0715-105/+125
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | / / / / | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
generated by cgit v0.12 at 2025-02-01 10:58:44 (GMT)