summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qabstractscrollarea.h
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-12-18 09:58:50 (GMT)
committeraxis <qt-info@nokia.com>2009-12-18 09:58:50 (GMT)
commitab8508380d6e5875ed871196eb09642380ac1aef (patch)
treed7b93292cbad00cbcb23fdc6feb705f35ccd38a2 /src/gui/widgets/qabstractscrollarea.h
parentbcf5564eccd7bc7591894561cdfc5eee7e77ba57 (diff)
parentde1e5ce30bfe21a054d56fbe947721e3467b6107 (diff)
downloadQt-ab8508380d6e5875ed871196eb09642380ac1aef.zip
Qt-ab8508380d6e5875ed871196eb09642380ac1aef.tar.gz
Qt-ab8508380d6e5875ed871196eb09642380ac1aef.tar.bz2
Merge branch 'qmakeExtraCompilerFixes' using "ours" strategy
Note that I merged using the "ours" strategy, because the patch from that branch is no longer needed for building for Symbian. However, it is a big patch, which could potentially be used later, therefore I preserved it in history this way.
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea.h')
0 files changed, 0 insertions, 0 deletions