summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Make S60 integration optional.Jason Barron2009-07-156-24/+28
| | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* Merge branch 'fixing_tst_qdatetimeedit'axis2009-07-101-8/+10
|\ | | | | | | | | Conflicts: src/gui/kernel/qkeysequence.cpp
| * Restructured some code that had flawed logic.axis2009-07-091-8/+10
| | | | | | | | | | | | | | | | | | A different codepath was taken when QT_KEYPAD_NAVIGATION was defined, despite keypad navigation itself being off. Now it should behave the same in both cases. This helped the autotests to pass on Symbian. AutoTest: Passed RevBy: Trust me
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-096-27/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-074-14/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * Document unified toolbar change with regard to full screen change.Norwegian Rock Cat2009-07-011-3/+4
| | |
| | * Doc: Fixed a doc bug in QPlainTextEdit class description.Geir Vattekar2009-06-301-7/+7
| | | | | | | | | | | | | | | Task-number: 256762 Reviewed-by: TrustMe
| | * Doc: About menu on the Mac gets the application name from Info.plist.Geir Vattekar2009-06-301-2/+3
| | | | | | | | | | | | | | | Task-number: 256818 Reviewed-by: Trenton Schulz
| | * Remove unused variablesAnders Bakken2009-06-291-2/+0
| | | | | | | | | | | | | | | | | | These variables are never used. Reviewed-by: TrustMe
| * | Fixed out-of-order construction.axis2009-07-061-2/+3
| | |
| * | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-11/+0
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29152-309/+316
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | Compile fixes for S60 + 4.6.Jason Barron2009-07-071-1/+1
| | | | | | | | | | | | | | | Update some things after pulling in master-stable to get things compiling again.
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30153-1009/+1025
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | QMenuBar: adding autotest for the geometry calculationThierry Bastian2009-06-291-5/+6
| | | | | | | | | | | | | | | | Also fixed a bug that would take the VMargin 3 times instead of 2.
| * | | Fix some coverity warningsThierry Bastian2009-06-294-8/+6
| | | |
| * | | QMenuBar: some private members weren't initializedThierry Bastian2009-06-291-1/+4
| | | | | | | | | | | | | | | | This was a coverity warning
| * | | QMenuBar: adding autotest and simplify/fix geometry calculationThierry Bastian2009-06-292-15/+9
| | | |
| * | | QMenu: adding autotest for the geometry calculationsThierry Bastian2009-06-291-4/+4
| | | | | | | | | | | | | | | | I also fixed an off-by-1 pixel bug
| * | | QMenu: fixed geometry problem that was adding twice the panel widthThierry Bastian2009-06-291-5/+6
| | | |
| * | | QMenuBar: simplification of codeThierry Bastian2009-06-293-114/+99
| | | | | | | | | | | | | | | | More to come: calculation of geometry
| * | | Doc - Improved the Detailed Description section for QCheckBox withKavindra Devi Palaraja2009-06-291-58/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screenshots and some cleaned up sentences. Reviewed-By: TrustMe Details: Also fixed the error in the sentence mentioning that QButtonGroup can be used to group buttons visually thanks to a bug report.
| * | | Compile.Norwegian Rock Cat2009-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | I now need to get the index of the action before I can find any corresponding window item.
| * | | Fixed QPushButton sizeHint recalculation bug.jasplin2009-06-292-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch causes the size hint of QPushButton to be recalculated in cases where the value of the autoDefault property may have changed due to changes in the ancestor chain. If not explicitly set, the value of the autoDefault property depends on the presence of a QDialog ancestor. Note: The new autotest covers two different use cases related to this behavior. Reviewed-by: janarve Task-number: 255581
| * | | QMenu: refactor for the QWidgetActions' widget.Thierry Bastian2009-06-262-30/+24
| | | | | | | | | | | | | | | | | | | | We now use QList/QVector over QHash. It is more efficient because most of the time we iterate over the list of actions anyway.
| * | | QMenu: refactor of the update of the geometry to have one central placeThierry Bastian2009-06-262-183/+144
| | | | | | | | | | | | | | | | of calculation (ie. updateActionRects)
| * | | QMenu: Fixed a painting regressionThierry Bastian2009-06-262-7/+14
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-1/+1
| |\ \ \
| | * | | QMenu: fixed regression in autotestThierry Bastian2009-06-261-1/+1
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-90/+92
| |\ \ \ \ | | |/ / /
| | * | | QMenu refactor to simplify a bit geometry calculationThierry Bastian2009-06-262-90/+92
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-5/+5
| |\ \ \ \ | | |/ / /
| | * | | QMenu: Fixed geometry for actions with specific fontThierry Bastian2009-06-251-5/+5
| | | | | | | | | | | | | | | | | | | | Task-number: 256918
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-254-109/+110
| |\ \ \ \ | | |/ / /
| | * | | QDockWidget/Toolbars refactor to avoid list copiesThierry Bastian2009-06-244-109/+110
| | | | | | | | | | | | | | | | | | | | This also helps understanding the code better.
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2413-91/+92
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| | * | | Remove dead code (private slot) in QLineEditThierry Bastian2009-06-243-9/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: janarve
| | * | | QLineEdit's context menu now disables cut/copy action in password modeThierry Bastian2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 256838 Reviewed-by: janarve
| | * | | Fixed sizeHint update bug in QSpinBox.jasplin2009-06-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSpinBox failed to recalculate its cached size hint when setting the range, prefix, or suffix. Reviewed-by: janarve Task-number: 255051
| | * | | Put back in these status bar changes for 10.4Norwegian Rock Cat2009-06-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was a bit overzelous removing them, but they should remain for 10.4 Reviewed-by: Morten Sørvig
| | * | | More culling of Panther Code.Norwegian Rock Cat2009-06-232-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| | * | | Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-232-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-231-5/+12
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | * | Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-231-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| | * | | QDockWidget: size incorrect when moving separator on fixed-size dock.Thierry Bastian2009-06-234-61/+58
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-234-52/+61
| |\ \ \ \ | | |/ / /
| | * | | QDockWidget: removed separator for not resizable dock widgetThierry Bastian2009-06-224-52/+61
| | | | | | | | | | | | | | | | | | | | Task-number: 212058
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-222-11/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| | * | | doc: Fixed typo.Martin Smith2009-06-221-6/+5
| | | | | | | | | | | | | | | | | | | | Task-number: 256287
| | * | | QMenu: fixed a bug that prevented from opening a context menu with midThierry Bastian2009-06-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button and still be able to activate an action Task-number: 253494
generated by cgit v0.12 at 2024-12-27 12:37:59 (GMT)