summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix copyright and a few codestyle mistakesThierry Bastian2011-04-143-114/+113
| | | | | Reviewed-By: Trust-Me Merge-Request: 916
* Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterfaceAurélien Gâteau2011-04-145-14/+14
| | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Make ctor and dtor of QAbstractMenuBarImpl inlineAurélien Gâteau2011-04-143-47/+3
| | | | | | | This way the class does not need to be exported Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* QAbstractMenuBarImpl::allowSetVisible => setVisibleAurélien Gâteau2011-04-144-14/+6
| | | | | | | | This makes it possible to alter the behavior of QMenuBar::setVisible(). It seems to be needed for the Mac menubar. Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Introduce menubar plugin systemAurélien Gâteau2011-04-144-1/+41
| | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Introduce QAbstractMenuBarImplAurélien Gâteau2011-04-147-299/+694
| | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Hide Q<Platform>MenuActionAurelien Gateau2011-04-145-10/+10
| | | | | | | | This will help abstracting the platform specific parts of QMenuBarPrivate in a common interface. Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Fix warning about initialization orderAurélien Gâteau2011-04-141-3/+3
| | | | | Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* Add the QIdentityProxyModel.Stephen Kelly2011-04-125-1/+701
| | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Fix incorrect rendering of checked menu items on Windows ClassicJonathan Liu2011-04-122-10/+7
| | | | | | | | | | | | | | | | | | | | | Modify rendering of checked menu items when using Windows Classic style to be more native looking. Changes: * Checked menu items with no icon are not drawn sunken * Disabled checked menu items with an icon have a plain background instead of a checkerboard pattern same as when enabled * Check mark is drawn with highlighted text color when selected to match text * Fix check mark offset for disabled unselected checked menu item as the entire check mark was drawn shifted (1, 1) * Fix color of check mark shadow for disabled unselected checked menu item as it was same color as the check mark when it should be a light color Task-number: QTBUG-15098 Merge-request: 2513 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Fix a bug with menu overflowing from a lower resolution second screen.Pierre Rossi2011-04-112-14/+51
| | | | | | | | | The menu needs to take into account the screen geometry of the screen it's about to be shown on (not the last screen it was shown on) when updating its actions rects Task-number: QTBUG-2748 Reviewed-by: Thierry
* Calculate the submenu position after emitting aboutToShow()Pierre Rossi2011-04-111-21/+21
| | | | | | | | The rationale behind this is that if the submenu gets populated in a slot connected to aboutToShow(), we'll have to do it again anyway. Task-number: QTBUG-14739 Reviewed-by: Thierry
* Fix progressbar animation on VistaJens Bache-Wiig2011-04-061-5/+4
| | | | | | | | | | | This fixes two issues. - The indeterminate animation was sometimes incorrectly disabled when value was 0 - The progress animation was incorrectly stopped when progress bars were disabled Task-number: QTBUG-10957 Reviewed-by: richard
* QTabWidget/Win: do not add content margin when documentMode enabledJonathan Liu2011-04-051-2/+8
| | | | | | | | | | | QTabWidget has 2 pixel bottom and right content margin. This removes the margin to maximize the area available for content and improve consistency with other Qt styles when documentMode is enabled. Task-number: QTBUG-15769 Merge-request: 957 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* QTableView: prevent QTableView from hanging when removing rows.Pierre Rossi2011-04-042-1/+21
| | | | | | | | | | | The problem was introduced in cd2afafb where we removed some code that was meant to adjust the header's offset upon row removal. The problem with this is that visualIndexAt() is likely to return -1 in QHeaderView::paintEvent, which in turn will lead to calling paintSection for each and every section. Task-number: QTBUG-18551 Reviewed-by: Thierry
* QFileSystemModel: Handle QDir::NoDot and QDir::NoDotDot for setFilterJonathan Liu2011-04-041-5/+7
| | | | | | | | Add support for QDir::NoDot and QDir::NoDotDot for setFilter in QFileSystemModel. Task-number: QTBUG-14760 Reviewed-by: Frederik
* Don't crash when requesting text.Frederik Gladhorn2011-04-011-1/+5
| | | | | | | Sometimes during initialization the QAccessibleItemRow will still be in an invalid state. Reviewed-by: Jan-Arve
* Let QAccessibleButton::text return something even when not visible.Frederik Gladhorn2011-04-011-3/+0
| | | | | Buttons would not report their text when hidden, which is inconsistent. Reviewed-by: Jan-Arve
* Fixed regression where AT client did not always announce stuff properly.Jan-Arve Sæther2011-03-291-1/+6
| | | | | | | | | | | | | This fixes a regression that was created by 75e478abdf336bbdc1b00e2ca4f5293d5455a0cb. That broke accessibility on 64 bit windows, since lParam can both be 0x00000000fffffffc and 0xfffffffffffffffc. However, MSDN explicitly says that lParam should be casted to a DWORD, which would result in (an unsigned) 0xfffffffc in both cases. This can then be compared to OBJID_CLIENT (defined to ((LONG)0xFFFFFFFC). Reviewed-by: Prasanth Ullattil
* Don't use inactive borders for spinbox on MacJens Bache-Wiig2011-03-281-1/+1
| | | | | | | | | This was probably caused by the fact that the only spinbox visible in the main control panel has an inactive frame border. In XCode 4, however the spin buttons are generally attached to an active lineedit frame, so we change the default for 4.8. Reviewed-by: gabriel
* Cocoa: respect QT_NO_EXCEPTION in color dialogRichard Moe Gustavsen2011-03-241-0/+5
| | | | | | | If the macro is set, we should not use cocoa exceptions either, as this causes compile failures Rev-By: jbache
* Merge branch 'master-upstream'Thierry Bastian2011-03-24515-3178/+16810
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-2437-14/+188
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code Update the data files for the QString benchmark test Fix a bug in the SSE2 UTF-8 decoder. Add ARM Neon versions of fromLatin1 and fromUtf8 Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE) Add baselines and zeros to the benchmarks. Add an UTF-8 conversion on trusted data and no BOM. Make it easier to write a UTF-8 conversion on trusted data Add the missing tests and 4-byte UTF-8 sequences Improve the code and avoid unnecessary stores Add an UTF-8 conversion optimised for ASCII using SSE2 Add an UTF-8 conversion code that is optimised for ASCII Add a stateless copy of the Qt 4.7 UTF-8 codec. Add UTF-8 code benchmarks Improve a little more the core loop and propagate to the other code Reduce the number of operations in the main loop Add an SSE4 version using PMOVZXBW and PSRLDQ Attempt to improve the epilog code ...
| | * Revert "Add a feature to QTestLib to correct benchmark results."Thiago Macieira2011-03-2220-134/+33
| | | | | | | | | | | | This reverts commit 3cc83349d9a07bcb7ae9c338bfdc355905a5a2f1.
| | * Add a feature to QTestLib to correct benchmark results.Thiago Macieira2011-03-2220-33/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two special values are added to the measurement of benchmarks: a zero and a comparison. The "zero" value is to be used when the test incurs a non-negligible overhead just to run. The benchmark author should add an "empty" run that measures basically the overhead and set it to attribute QTest::Zero. The "zero" value will be subtracted from any benchmark measurements before reporting (currently the plain logger only). Note that all benchmark types don't make sense, notably those already measurement some kind of rate, like frames per second and bytes per second. The "baseline" value is the comparison (with the "zero" subtracted"). When the baseline is set, the library will instead report the ratio between the benchmark and the baseline, in percentage or a multiple (e.g. "75%" [of the time] or "10.0x" [faster]). Adding measurements in "robes" left for future improvement. This feature is not reviewed and will be reverted later.
| | * Fix warning about maybe-uninitialised use of variableThiago Macieira2011-03-221-0/+1
| | |
| | * Fix warning about comparing Qt::Orientation to QDeclarativeView::OrientationThiago Macieira2011-03-221-1/+1
| | |
| | * Fix warning about copy constructor not initialising base explicitlyThiago Macieira2011-03-221-0/+1
| | |
| | * Fix warning about "data" being unused.Thiago Macieira2011-03-221-0/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
| | |
| | * QSharedNetworkSession: Fix compile on AIX.Pierre Rossi2011-03-221-0/+2
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-22248-2095/+11460
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| | * | Fix compilation with QT_NO_Tasuku Suzuki2011-03-2129-11/+176
| | | | | | | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-1732-115/+1834
| | |\ \
| | * | | corelib/tools: Add two ### Qt 5 commentshjk2011-03-162-0/+6
| | | | | | | | | | | | | | | | | | | | A proposol to speed up qHash(QString) and QVector.
| * | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-2317-204/+234
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one Text bounding rect calculated incorrectly if non-top aligned. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. Fix writing to an attached property from script. fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| | * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-221-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-221-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Text bounding rect calculated incorrectly if non-top aligned.
| | | | * | | | Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
| | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-225-11/+36
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-225-11/+36
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one
| | | | * | | | | Fixed drawImage() not to attempt drawing null images on openvg.Laszlo Agocs2011-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVGPaintEngine did not have proper checks for null QImage in the drawImage functions so it went on trying to create a VGImage of size 0x0 which is bound to fail always. This resulted in confusing warnings about not being able to reclaim space for 0x0 images. Reviewed-by: Jani Hautakangas
| | | | * | | | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-2212-191/+196
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-224-6/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.4 Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call
| | | | * \ \ \ \ Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2134-256/+557
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.7.4
| | | | * | | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-211-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest.
| | | | * | | | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously version resolved to unknown if Symbian or S60 version was queried and Series60v5.3.sis was found. Note that proper detection and enumerations for the new platform will come when they are agreed upon. Until then, this fix will make the new platform more usable. Task-number: QT-4593 Reviewed-by: Sami Merila
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-211-1/+1
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't crash calling QTextDocument::blockBoundingRect on invalid block
generated by cgit v0.12 at 2025-02-01 10:13:38 (GMT)