diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 07:59:05 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 07:59:05 (GMT) |
commit | 1a7a1172d048108c30a9890ce9477686711ad756 (patch) | |
tree | dc3db3ec8ae56fc8f13440a550e55959d4bf40bc /examples/network/bearermonitor/bearermonitor.pro | |
parent | ab672d88f906b0d6f2d45f9ebbfbf12fdcfba51e (diff) | |
parent | adc6d4776e6570fa6e6d5d2e4e40fe7eab0ebb99 (diff) | |
download | Qt-1a7a1172d048108c30a9890ce9477686711ad756.zip Qt-1a7a1172d048108c30a9890ce9477686711ad756.tar.gz Qt-1a7a1172d048108c30a9890ce9477686711ad756.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix bearermonitor when building for Maemo in scratchbox.
Diffstat (limited to 'examples/network/bearermonitor/bearermonitor.pro')
-rw-r--r-- | examples/network/bearermonitor/bearermonitor.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index 4b2c35b..bd9bd68 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -8,7 +8,8 @@ SOURCES = main.cpp \ bearermonitor.cpp \ sessionwidget.cpp -maemo5|maemo6 { +maemo5|maemo6|linux-g++-maemo { + DEFINES += MAEMO_UI FORMS = bearermonitor_maemo.ui \ sessionwidget_maemo.ui } else { |