summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Constantin <adrian.constantin@nokia.com>2010-10-05 18:31:27 (GMT)
committerAdrian Constantin <adrian.constantin@nokia.com>2010-10-07 13:58:38 (GMT)
commitd0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a (patch)
tree5b6a858ca9ddbb1cd6933423ec30a94ce987d8b5
parent3fddf68f376fe06d0af3f390a94ed84cc1a3fa38 (diff)
downloadQt-d0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a.zip
Qt-d0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a.tar.gz
Qt-d0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a.tar.bz2
Fix the icd auto config test after restructuring the icd plugin dependencies
* Remove the auto config tests related to libicd-network-wlan-dev * Add test for the icd backend * Add test for connsettings See also f532d8fcd236be9933e4186a95561e1c264de277. Reviewed-by: Aaron McCarthy
-rw-r--r--config.tests/unix/icd/icd.cpp8
-rwxr-xr-xconfigure4
2 files changed, 9 insertions, 3 deletions
diff --git a/config.tests/unix/icd/icd.cpp b/config.tests/unix/icd/icd.cpp
index 19c171b..08ef115 100644
--- a/config.tests/unix/icd/icd.cpp
+++ b/config.tests/unix/icd/icd.cpp
@@ -39,9 +39,15 @@
**
****************************************************************************/
-#include <libicd-network-wlan-dev.h>
#include <wlancond.h>
+
#include <icd/dbus_api.h>
+#include <icd/network_api_defines.h>
+
+#include <icd/osso-ic.h>
+#include <icd/osso-ic-dbus.h>
+
+#include <conn_settings.h>
int main(int, char **)
{
diff --git a/configure b/configure
index aca3467..0152c8e 100755
--- a/configure
+++ b/configure
@@ -5485,8 +5485,8 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
# auto-detect icd support
if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings 2>/dev/null`
- QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings 2>/dev/null`
+ QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings icd2 2>/dev/null`
+ QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings icd2 2>/dev/null`
fi
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then
[ "$CFG_ICD" = "auto" ] && CFG_ICD=yes