[oe-commits] org.oe.dev merge of '375a27e2a1e696f0e3ebd6e8faf905bae63a016c'

[mickeyl commit]

merge of '375a27e2a1e696f0e3ebd6e8faf905bae63a016c'
     and '5e37b755f10936f81113606e76957fb837b04eda'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 140d4e8beefc04aa7b8e589525cf19f1319cd628
ViewMTN: http://monotone.openembedded.org/revision/info/140d4e8beefc04aa7b8e589525cf19f1319cd628
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/uicmoc/uicmoc4-native_4.3.1.bb
Diffs:

#
# mt diff -r375a27e2a1e696f0e3ebd6e8faf905bae63a016c -r140d4e8beefc04aa7b8e589525cf19f1319cd628
#
# 
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [7e9b719553b5e77b1e579024abf0be3c694dce4f]
#    to [4475aa19d15d8d38e8e7b1fa831c3c012ef9c190]
# 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	7e9b719553b5e77b1e579024abf0be3c694dce4f
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	4475aa19d15d8d38e8e7b1fa831c3c012ef9c190
@@ -97,9 +97,8 @@ case `module_id` in
         "Nokia N800")
                 ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
         *)
-# It is a device we do not know about, in which case we force
                 # It is a device we do not know about, in which case we force
-# kdrive to use the current framebuffer geometry -- otherwise
+                # kdrive to use the current framebuffer geometry -- otherwise
                 # it will default to trying to achieve 1024x768
                 S=`fallback_screen_arg`
                 ARGS="$ARGS -screen $S" ;;


#
# mt diff -r5e37b755f10936f81113606e76957fb837b04eda -r140d4e8beefc04aa7b8e589525cf19f1319cd628
#
# 
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  from [7ac42702123875fa07b391881bfde6f56531dd93]
#    to [83b84a6976c32c4c094913143c9ed28a2b37c610]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	7ac42702123875fa07b391881bfde6f56531dd93
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -26,6 +26,7 @@ do_configure() {
 EXTRA_OEMAKE = " "
 
 do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
 	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }