-@@ -1280,40 +1265,34 @@
- [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then
- if test_execute; then
--# cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4"
--# cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`"
- if [ "$OS" = "darwin" ]; then
- cnf_append "VBOX_WITH_QT4GUI" "1"
- else
+@@ -1343,21 +1327,19 @@
+ #endif
+ }
+ EOF
+- for q in $QT4DIR; do
+- INCQT4="$q/include $q/include/QtCore"
+- FLGQT4="-DQT_SHARED"
+- I_INCQT4=`prefix_I "$INCQT4"`
+- LIBQT4="-L$q/lib -lVBoxQtCore"
+- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
+- foundqt4=2
+- break;
+- fi
+- LIBQT4="-L$q/lib -lQtCore"
+- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
+- foundqt4=1
+- break;
+- fi
+- done
++ INCQT4="/usr/include/qt4 /usr/include/qt/QtCore"
++ FLGQT4="-DQT_SHARED"
++ I_INCQT4=`prefix_I "$INCQT4"`
++ LIBQT4="-L/usr/lib/qt4 -lVBoxQtCore"
++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
++ foundqt4=2
++ break;
++ fi
++ LIBQT4="-L/usr/lib/qt4 -lQtCore"
++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
++ foundqt4=1
++ break;
++ fi
+ fi
+ fi
+ if [ -n "$foundqt4" ]; then
+@@ -1393,21 +1375,19 @@
+ cnf_append "VBOX_WITH_QT4_SUN" "1"
+ fi