Attachment #45903 for bug #65504




        if test -f "$dir/qglobal.h"; then
            have_qt=yes
            DBUS_QT_CXXFLAGS="-I$dir"
			DBUS_QT_LIBS="-I$QTDIR/lib/libqt-mt.la"
       fi
    done
fi

   AC_MSG_RESULT([not found])
fi

dnl linking to kdecore will give us a bit of help from libtool
if (! kde-config >& /dev/null); then
    have_qt=no
else
    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
        have_qt=no
    else
        DBUS_QT_LIBS="$kdelibs/libkdecore.la"
    fi
fi

if test x$have_qt = xno ; then
    AC_MSG_WARN([Qt development libraries not found])
fi

Lines 50-55 Link Here

(-)qt/connection.h (+1 lines)
50	Message borrowMessage();	50	Message borrowMessage();
51	Message popMessage();	51	Message popMessage();
52	void stealBorrowMessage( const Message& );	52	void stealBorrowMessage( const Message& );
		53	void dbus_connection_setup_with_qt_main (DBusConnection *connection);
53		54
54	public slots:	55	public slots:
55	void open( const QString& );	56	void open( const QString& );

Lines 156-161 Link Here

(-)qt/connection.cpp (+7 lines)
156	{	156	{
157	}	157	}
158		158
		159	void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
		160	{
		161	d->setConnection( connection );
		162	}
		163
		164
		165
159	/////////////////////////////////////////////////////////	166	/////////////////////////////////////////////////////////
160		167
161	#include "connection.moc"	168	#include "connection.moc"

Lines 162-174 Link Here

(-)qt/integrator.cpp (-2 / +7 lines)
162		162
163	void Integrator::slotRead( int fd )	163	void Integrator::slotRead( int fd )
164	{	164	{
165	Q_UNUSED( fd );	165	QIntDictIterator<Watch> it( m_watches );
		166	for ( ; it.current(); ++it )
		167	dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
		168
166	emit readReady();	169	emit readReady();
167	}	170	}
168		171
169	void Integrator::slotWrite( int fd )	172	void Integrator::slotWrite( int fd )
170	{	173	{
171	Q_UNUSED( fd );	174	QIntDictIterator<Watch> it( m_watches );
		175	for ( ; it.current(); ++it )
		176	dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
172	}	177	}
173		178
174	void Integrator::slotTimeout( DBusTimeout *timeout )	179	void Integrator::slotTimeout( DBusTimeout *timeout )

Return to bug 65504

Lines 812-817 Link Here

(-)configure.in.org (-12 / +1 lines)
812	if test -f "$dir/qglobal.h"; then	812	if test -f "$dir/qglobal.h"; then
813	have_qt=yes	813	have_qt=yes
814	DBUS_QT_CXXFLAGS="-I$dir"	814	DBUS_QT_CXXFLAGS="-I$dir"
		815	DBUS_QT_LIBS="-I$QTDIR/lib/libqt-mt.la"
815	fi	816	fi
816	done	817	done
817	fi	818	fi
Lines 821-838 Link Here
821	AC_MSG_RESULT([not found])	822	AC_MSG_RESULT([not found])
822	fi	823	fi
823		824
824	dnl linking to kdecore will give us a bit of help from libtool
825	if (! kde-config >& /dev/null); then
826	have_qt=no
827	else
828	kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
829	if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
830	have_qt=no
831	else
832	DBUS_QT_LIBS="$kdelibs/libkdecore.la"
833	fi
834	fi
835
836	if test x$have_qt = xno ; then	825	if test x$have_qt = xno ; then
837	AC_MSG_WARN([Qt development libraries not found])	826	AC_MSG_WARN([Qt development libraries not found])
838	fi	827	fi