summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qproxystyle_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-19 17:03:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-19 17:03:54 (GMT)
commit2aa8526f05c9e3b2b1ee45bf0653600640aa622e (patch)
tree1f15b6bb3f1dc769eefd96f9a3128a5703160bd4 /src/gui/styles/qproxystyle_p.h
parent8a97a1cac688d0e6e6aef40bfa396a81d7bfc0b8 (diff)
parent219a7248733a8f9dce8674aab405e5223693f0a2 (diff)
downloadQt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.zip
Qt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.tar.gz
Qt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (25 commits) Freetype is not used on symbian, don't use it. Disable compiling unsupported classes for Symbian Make the 'freeze' target work for linux/symbian. Update QtDeclarative .def files for 4.7 Improve virtual mouse on E72 optical joystick Fix build break in Symbian Set edit focus to proper control in flightinfo demo Update symbian def files for 4.7 Do not autopatch <app>_installer.pkg when self-signing Fix pkg_prerules handling for installer packages Fix weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian ...
Diffstat (limited to 'src/gui/styles/qproxystyle_p.h')
0 files changed, 0 insertions, 0 deletions