summaryrefslogtreecommitdiffstats
path: root/src/qt_install.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-20 06:19:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-20 06:19:34 (GMT)
commit6122f0746cac1008d967c19a8b609d7c92fbc8a5 (patch)
treebf8b58ecda98002b0df43b716eda1282614c9e4b /src/qt_install.pri
parent0f860c39622996f7de67f19d9913dafd57cc8031 (diff)
parentc5a377e944f9a87c372ff8371c66b03d861803a6 (diff)
downloadQt-6122f0746cac1008d967c19a8b609d7c92fbc8a5.zip
Qt-6122f0746cac1008d967c19a8b609d7c92fbc8a5.tar.gz
Qt-6122f0746cac1008d967c19a8b609d7c92fbc8a5.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass.
Diffstat (limited to 'src/qt_install.pri')
0 files changed, 0 insertions, 0 deletions