Merge remote branch 'lighthouse/4.7' into lighthouse-master

Conflicts:
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	tests/auto/qpainter/tst_qpainter.cpp

7 files changed, 64 insertions, 140 deletions

diff --git a/src/3rdparty/libconninet/Makefile.am b/src/3rdparty/libconninet/Makefile.am
deleted file mode 100644
index 250637a..0000000
--- a/src/3rdparty/libconninet/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-SUBDIRS = src tests
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = conninet.pc
-
-MAINTAINERCLEANFILES = \
-        Makefile.in config.h.in configure \
-        install-sh ltmain.sh missing mkinstalldirs \
-        config.log config.status config.guess config.sub \
-        build-stamp compile depcomp acinclude.m4 aclocal.m4 \
-	debian/files \
-	debian/libconninet0.postinst.debhelper \
-	debian/libconninet0.postrm.debhelper \
-	debian/libconninet0.substvars
-
-EXTRA_DIST = \
-	debian/changelog \
-	debian/compat \
-	debian/control \
-	debian/copyright \
-	debian/libconninet0-dev.dirs \
-	debian/libconninet0-dev.files \
-	debian/libconninet0.dirs \
-	debian/libconninet0.files \
-	debian/rules
-
-# get rid of debian build dirs
-maintainer-clean-local:
-	-rm -rf debian/build debian/tmp \
-		debian/libconninet0 \
-		debian/libconninet0-dev \
-		debian/libconninet0-dbg
-
-if DOXYGEN_DOCS_ENABLED
-  DOXYGEN_LINE = $(DOXYGEN) doxygen.cfg
-else 
-  DOXYGEN_LINE = 
-endif
-
-.PHONY : doc
-
-doc: 
-	$(DOXYGEN_LINE)
-
-deb: dist
-	-mkdir $(top_builddir)/debian-build
-	cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz
-	cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot -sa -D
-	-rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
diff --git a/src/3rdparty/libconninet/debian/changelog b/src/3rdparty/libconninet/debian/changelog
index 436d318..4063317 100644
--- a/src/3rdparty/libconninet/debian/changelog
+++ b/src/3rdparty/libconninet/debian/changelog
@@ -1,9 +1,17 @@
-libconninet (0.41+0m6) unstable; urgency=low
+libconninet (0.42+0m6) unstable; urgency=low
 
   * This entry has been added by BIFH queue processor
-    version has been changed to 0.41+0m6
+    version has been changed to 0.42+0m6
 
- -- Qing Jin <ext-qing.1.jin@nokia.com>  Thu, 15 Jul 2010 15:56:38 +0300
+ -- Qing Jin <ext-qing.1.jin@nokia.com>  Thu, 22 Jul 2010 14:04:58 +0300
+
+libconninet (0.42) unstable; urgency=low
+
+  * Fixes: NB#180536 - Uploads to online services are not working.
+    This is a regression caused by fix to bug 175098, the timeout was never
+    expiring when waiting reply from icd.
+
+ -- Jukka Rissanen <jukka.rissanen@nokia.com>  Mon, 19 Jul 2010 12:23:30 +0300
 
 libconninet (0.41) unstable; urgency=low
 
diff --git a/src/3rdparty/libconninet/src/Makefile.am b/src/3rdparty/libconninet/src/Makefile.am
deleted file mode 100644
index be7a1e5..0000000
--- a/src/3rdparty/libconninet/src/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-DEFS = -DDBUS_API_SUBJECT_TO_CHANGE -DGCONF_DISABLE_DEPRECATED
-INCLUDES = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @GCONF_CFLAGS@ @OSSO_IC_CFLAGS@ @ICD_DEV_CFLAGS@ @QTCORE_CFLAGS@ @QTNETWORK_CFLAGS@ @QTDBUS_CFLAGS@ @QGCONF_CFLAGS@ @CONNSETTINGS_CFLAGS@
-LIBS = @GLIB_LIBS@ @DBUS_LIBS@ @GCONF_LIBS@ @OSSO_IC_LIBS@ @ICD_DEV_LIBS@ @QTCORE_LIBS@ @QTDBUS_LIBS@ @QTNETWORK_CFLAGS@ @QGCONF_LIBS@ @CONNSETTINGS_LIBS@
-
-AM_CFLAGS = $(CONCFLAGS)
-
-lib_LTLIBRARIES = libconninet.la
-libconninet_la_SOURCES = \
-	maemo_icd.cpp \
-	dbusdispatcher.cpp \
-	iapconf.cpp \
-	iapmonitor.cpp \
-	proxyconf.cpp
-
-#libconninet_la_LDFLAGS = -version-info 0:0:0
-
-conninetincludedir = $(includedir)/conninet
-conninetinclude_HEADERS =  \
-	maemo_icd.h \
-	dbusdispatcher.h \
-	iapconf.h \
-	iapmonitor.h \
-	proxyconf.h
-
-nodist_libconninet_la_SOURCES = \
-	moc_maemo_icd.cpp \
-	moc_dbusdispatcher.cpp
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# This rule lets GNU make create any moc_*.cpp from the equivalent *.h
-moc_%.cpp: %.h
-	moc $< -o $@
-
-# This line ensures that generated moc files are deleted when we make clean.
-CLEANFILES = *_moc.cpp *.loT
diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.cpp b/src/3rdparty/libconninet/src/dbusdispatcher.cpp
index f5b830a..7581982 100644
--- a/src/3rdparty/libconninet/src/dbusdispatcher.cpp
+++ b/src/3rdparty/libconninet/src/dbusdispatcher.cpp
@@ -31,7 +31,7 @@
 namespace Maemo {
 
 /*!
-    \class Maemo::DBusDispatcher
+    \class DBusDispatcher
 
     \brief DBusDispatcher is a class, which is able to send DBUS method call
     messages and receive unicast signals from DBUS object.
diff --git a/src/3rdparty/libconninet/src/maemo_icd.cpp b/src/3rdparty/libconninet/src/maemo_icd.cpp
index bc84fbc..026241c 100644
--- a/src/3rdparty/libconninet/src/maemo_icd.cpp
+++ b/src/3rdparty/libconninet/src/maemo_icd.cpp
@@ -30,9 +30,30 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace Maemo {
 
+#undef PRINT_DEBUGINFO
+#ifdef PRINT_DEBUGINFO
+  static FILE *fdebug = NULL;
+#define PDEBUG(fmt, args...)						\
+  do {									\
+    struct timeval tv;							\
+    gettimeofday(&tv, 0);						\
+    fprintf(fdebug, "DEBUG[%d]:%ld.%ld:%s:%s():%d: " fmt,		\
+	    getpid(),							\
+	    tv.tv_sec, tv.tv_usec,					\
+	    __FILE__, __FUNCTION__, __LINE__, args);			\
+    fflush(fdebug);							\
+  } while(0)
+#else
+#define PDEBUG(fmt...)
+#endif
+
+
 /* Reference counting singleton class that creates a single connection
  * to icd so that icd reference counting works as expected. This is
  * needed because DBusDispatcher uses private dbus connections
@@ -239,6 +260,13 @@ public:
 
       icd = myfriend;
       timeout = dbus_timeout;
+
+#ifdef PRINT_DEBUGINFO
+      if (!fdebug) {
+	fdebug = fopen("/tmp/maemoicd.log", "a+");
+      }
+      PDEBUG("created %s\n", "IcdPrivate");
+#endif
     }
 
     void clearState()
@@ -672,6 +700,8 @@ uint IcdPrivate::state_non_blocking(QList<IcdStateResult>& state_results)
     uint signals_left, total_signals;
     IcdStateResult result;
 
+    PDEBUG("%s\n", "non blocking state");
+
     clearState();
     reply = mDBus->call(ICD_DBUS_API_STATE_REQ);
     if (reply.type() != QVariant::List)
@@ -719,6 +749,7 @@ uint IcdPrivate::state_non_blocking(QList<IcdStateResult>& state_results)
     }
     timer.stop();
 
+    PDEBUG("total_signals=%d\n", total_signals);
     return total_signals;
 }
 
@@ -731,11 +762,14 @@ uint IcdPrivate::state_non_blocking(QList<IcdStateResult>& state_results)
  */
 uint IcdPrivate::state(QList<IcdStateResult>& state_results)
 {
-    QTimer timer;
     QVariant reply;
     QVariantList vl;
     uint signals_left, total_signals;
     IcdStateResult result;
+    time_t started;
+    int timeout_secs = timeout / 1000;
+
+    PDEBUG("%s\n", "state_results");
 
     clearState();
     reply = mDBus->call(ICD_DBUS_API_STATE_REQ);
@@ -749,17 +783,16 @@ uint IcdPrivate::state(QList<IcdStateResult>& state_results)
     if (!signals_left)
         return 0;
 
-    timer.setSingleShot(true);
-    timer.start(timeout);
+    started = time(0);
     state_results.clear();
     mError.clear();
     while (signals_left) {
         mInterface.clear();
-	while (timer.isActive() && mInterface.isEmpty()) {
+	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
 	    mDBus->synchronousDispatch(1000);
 	}
 
-	if (!timer.isActive()) {
+        if (time(0)>(started+timeout_secs)) {
 	    total_signals = 0;
 	    break;
 	}
@@ -782,8 +815,8 @@ uint IcdPrivate::state(QList<IcdStateResult>& state_results)
 	    break;
 	}
     }
-    timer.stop();
 
+    PDEBUG("total_signals=%d\n", total_signals);
     return total_signals;
 }
 
@@ -956,11 +989,14 @@ static void get_addrinfo_all_result(QList<QVariant>& args,
  */
 uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
 {
-    QTimer timer;
     QVariant reply;
     QVariantList vl;
     uint signals_left, total_signals;
     IcdAddressInfoResult result;
+    time_t started;
+    int timeout_secs = timeout / 1000;
+
+    PDEBUG("%s\n", "addr_results");
 
     clearState();
     reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ);
@@ -976,16 +1012,15 @@ uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
     if (!signals_left)
         return 0;
 
-    timer.setSingleShot(true);
-    timer.start(timeout);
+    started = time(0);
     addr_results.clear();
     while (signals_left) {
         mInterface.clear();
-	while (timer.isActive() && mInterface.isEmpty()) {
+	while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) {
 	    mDBus->synchronousDispatch(1000);
 	}
 
-	if (!timer.isActive()) {
+        if (time(0)>(started+timeout_secs)) {
 	    total_signals = 0;
 	    break;
 	}
@@ -1003,7 +1038,8 @@ uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results)
 	    break;
 	}
     }
-    timer.stop();
+
+    PDEBUG("total_signals=%d\n", total_signals);
     return total_signals;
 }
 
@@ -1015,6 +1051,8 @@ uint IcdPrivate::addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results
     uint signals_left, total_signals;
     IcdAddressInfoResult result;
 
+    PDEBUG("%s\n", "non blocking addrinfo");
+
     clearState();
     reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ);
     if (reply.type() != QVariant::List)
@@ -1057,6 +1095,7 @@ uint IcdPrivate::addrinfo_non_blocking(QList<IcdAddressInfoResult>& addr_results
 	}
     }
     timer.stop();
+    PDEBUG("total_signals=%d\n", total_signals);
     return total_signals;
 }
 
diff --git a/src/3rdparty/libconninet/tests/Makefile.am b/src/3rdparty/libconninet/tests/Makefile.am
deleted file mode 100644
index f6f41ea..0000000
--- a/src/3rdparty/libconninet/tests/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-DEFS = -DDBUS_API_SUBJECT_TO_CHANGE
-INCLUDES = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @CONNSETTINGS_CFLAGS@ @OSSO_IC_CFLAGS@ @ICD_DEV_CFLAGS@ \
-	@QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ @QTCORE_CFLAGS@ @QTNETWORK_CFLAGS@ @QTTEST_CFLAGS@ \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src
-
-LIBS = @GLIB_LIBS@ @DBUS_LIBS@ @CONNSETTINGS_LIBS@ @OSSO_IC_LIBS@ @ICD_DEV_LIBS@ \
-	@QTCORE_LIBS@ @QTDBUS_LIBS@ @QTCORE_LIBS@ @QTNETWORK_LIBS@ @QTTEST_LIBS@ \
-	$(top_builddir)/src/libconninet.la
-
-AM_CFLAGS = $(CONCFLAGS)
-AM_LDFLAGS = -static
-
-bin_PROGRAMS = test_dbusdispatcher test_iapconf test_maemo_icd test_iapmonitor test_proxyconf
-
-test_dbusdispatcher_SOURCES = ut_dbusdispatcher.cpp
-ut_dbusdispatcher.o: ut_dbusdispatcher.moc
-
-test_iapconf_SOURCES = ut_iapconf.cpp
-ut_iapconf.o: ut_iapconf.moc
-
-test_maemo_icd_SOURCES = ut_maemo_icd.cpp
-ut_maemo_icd.o: ut_maemo_icd.moc
-
-test_iapmonitor_SOURCES = ut_iapmonitor.cpp
-ut_iapmonitor.o: ut_iapmonitor.moc
-
-test_proxyconf_SOURCES = ut_proxyconf.cpp
-ut_proxyconf.o: ut_proxyconf.moc
-
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# This rule lets GNU make create any *.moc from the equivalent *.cpp
-%.moc: %.cpp
-	moc $< -o $@
-
-# This line ensures that generated moc files are deleted when we make clean.
-CLEANFILES = *.moc
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 9dcba60..c1ca23d 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -139,6 +139,7 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 
 /*!
     \qmlclass WebView QDeclarativeWebView
+    \ingroup qml-view-elements
     \since 4.7
     \brief The WebView item allows you to add web content to a canvas.
     \inherits Item