[Kde-bindings] KDE/kdebindings/smoke/qt

Richard Dale Richard_Dale at tipitina.demon.co.uk
Wed Jul 5 11:42:14 UTC 2006 

SVN commit 558418 by rdale:

* Add new headers for Qt 4.2 TP1
* Change the QtDBus config check to work with Qt 4.2

CCMAIL: kde-bindings at kde.org



 M  +3 -2      Makefile.am  
 M  +6 -6      configure.in.in  
 M  +34 -3     header_list  
 M  +12 -14    qtdbus_header_list  


--- trunk/KDE/kdebindings/smoke/qt/Makefile.am #558417:558418
@@ -1,7 +1,8 @@
 lib_LTLIBRARIES = libsmokeqt.la
 
 # set the include path for X, qt and KDE
-INCLUDES         = -I$(srcdir)/.. $(all_includes) -I$(qt_includes)/QtUiTools
+INCLUDES         = -I$(srcdir)/.. $(all_includes) -I$(qt_includes)/QtUiTools \
+                   -I$(qt_includes)/QtDBus
 
 EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
 
@@ -10,7 +11,7 @@
 
 # the libraries to link against.
 libsmokeqt_la_LIBADD   = $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
-						$(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) \
+						$(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) $(LIB_QTSVG) \
 						$(GLLIB) $(LIBQSCINTILLA) \
 						-lQtSvg -lQtUiTools $(LIBQTDBUS) $(LIBQWT)
 
--- trunk/KDE/kdebindings/smoke/qt/configure.in.in #558417:558418
@@ -82,7 +82,7 @@
 fi
 
 dnl -------
-dnl Test for libdbus-qt4-1 (D-Bus support)
+dnl Test for libQtDBus (D-Bus support)
 dnl -------
 
 AC_ARG_ENABLE(
@@ -95,7 +95,7 @@
 
 AC_DEFUN([AC_FIND_QTDBUS],
 [
-AC_MSG_CHECKING([for libdbus-qt4-1])
+AC_MSG_CHECKING([for libQtDBus])
 AC_CACHE_VAL(ac_cv_lib_qtdbus,
 [
 AC_LANG_SAVE
@@ -105,17 +105,17 @@
  kde_libs_save="$LIBS"
  kde_cxxflags_save="$CXXFLAGS"
 
- LIBS="-ldbus-1 -ldbus-qt4-1 -ldbus-glib-1 $LIB_QTCORE $LIB_QTXML $LIBS"
+ LIBS="-ldbus-1 -lQtDBus -ldbus-glib-1 $LIB_QTCORE $LIB_QTXML $LIBS"
  CXXFLAGS="$CXXFLAGS $all_includes -DDBUS_COMPILATION"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
 AC_TRY_LINK([
-   #include <dbus-1.0/dbus/qdbus.h>
+   #include <QtDBus/qdbusconnection.h>
 ],
 [
-            QDBusConnection& b = QDBus::sessionBus();
+            QDBusConnection b = QDBus::sessionBus();
 ],
-            eval "ac_cv_lib_qtdbus='-ldbus-1 -ldbus-qt4-1 -ldbus-glib-1'",
+            eval "ac_cv_lib_qtdbus='-ldbus-1 -lQtDBus -ldbus-glib-1'",
             eval "ac_cv_lib_qtdbus=no")
 
  LDFLAGS=$kde_ldflags_save
--- trunk/KDE/kdebindings/smoke/qt/header_list #558417:558418
@@ -1,4 +1,5 @@
 QtCore/qabstracteventdispatcher.h
+QtCore/qabstractfileengine.h
 QtCore/qabstractitemmodel.h
 QtCore/qalgorithms.h
 QtCore/qbasictimer.h
@@ -25,6 +26,7 @@
 QtCore/qfeatures.h
 QtCore/qfile.h
 QtCore/qfileinfo.h
+QtCore/qfsfileengine.h
 QtCore/qglobal.h
 QtCore/qiodevice.h
 QtCore/qiterator.h
@@ -67,6 +69,7 @@
 QtCore/qtextstream.h
 QtCore/qthread.h
 QtCore/qthreadstorage.h
+QtCore/qtimeline.h
 QtCore/qtimer.h
 QtCore/qtranslator.h
 QtCore/qurl.h
@@ -85,6 +88,11 @@
 QtGui/qabstractslider.h
 QtGui/qabstractspinbox.h
 QtGui/qabstracttextdocumentlayout.h
+QtGui/qaccessiblebridge.h
+QtGui/qaccessible.h
+QtGui/qaccessibleobject.h
+QtGui/qaccessibleplugin.h
+QtGui/qaccessiblewidget.h
 QtGui/qactiongroup.h
 QtGui/qaction.h
 QtGui/qapplication.h
@@ -92,17 +100,23 @@
 QtGui/qboxlayout.h
 QtGui/qbrush.h
 QtGui/qbuttongroup.h
+QtGui/qcalendarwidget.h
 QtGui/qcheckbox.h
+QtGui/qcleanlooksstyle.h
 QtGui/qclipboard.h
 QtGui/qcolordialog.h
 QtGui/qcolor.h
 QtGui/qcolormap.h
 QtGui/qcombobox.h
 QtGui/qcommonstyle.h
+QtGui/qcompleter.h
 QtGui/qcursor.h
+QtGui/qdatawidgetmapper.h
 QtGui/qdatetimeedit.h
+QtGui/qdesktopservices.h
 QtGui/qdesktopwidget.h
 QtGui/qdial.h
+QtGui/qdialogbuttonbox.h
 QtGui/qdialog.h
 QtGui/qdirmodel.h
 QtGui/qdockwidget.h
@@ -112,18 +126,25 @@
 QtGui/qevent.h
 QtGui/qfiledialog.h
 QtGui/qfocusframe.h
+QtGui/qfontcombobox.h
 QtGui/qfontdatabase.h
 QtGui/qfontdialog.h
 QtGui/qfont.h
 QtGui/qfontinfo.h
 QtGui/qfontmetrics.h
 QtGui/qframe.h
+QtGui/qgraphicsitemanimation.h
+QtGui/qgraphicsitem.h
+QtGui/qgraphicssceneevent.h
+QtGui/qgraphicsscene.h
+QtGui/qgraphicsview.h
 QtGui/qgridlayout.h
 QtGui/qgroupbox.h
 QtGui/qhboxlayout.h
 QtGui/qheaderview.h
+QtGui/qiconengine.h
+QtGui/qiconengineplugin.h
 QtGui/qicon.h
-QtGui/qiconengine.h
 QtGui/qimage.h
 QtGui/qimageiohandler.h
 QtGui/qimagereader.h
@@ -149,6 +170,7 @@
 QtGui/qmenubar.h
 QtGui/qmenudata.h
 QtGui/qmenu.h
+QtGui/qmessageboxex.h
 QtGui/qmessagebox.h
 QtGui/qmime.h
 QtGui/qmovie.h
@@ -159,6 +181,7 @@
 QtGui/qpainterpath.h
 QtGui/qpalette.h
 QtGui/qpen.h
+QtGui/qpictureformatplugin.h
 QtGui/qpicture.h
 QtGui/qpixmapcache.h
 QtGui/qpixmap.h
@@ -198,8 +221,7 @@
 QtGui/qstylepainter.h
 QtGui/qstyleplugin.h
 QtGui/qsyntaxhighlighter.h
-QtGui/qtreewidgetitemiterator.h
-QtGui/qvboxlayout.h
+QtGui/qsystemtrayicon.h
 QtGui/qtabbar.h
 QtGui/qtableview.h
 QtGui/qtablewidget.h
@@ -221,10 +243,15 @@
 QtGui/qtooltip.h
 QtGui/qtreeview.h
 QtGui/qtreewidget.h
+QtGui/qtreewidgetitemiterator.h
+QtGui/qundogroup.h
+QtGui/qundostack.h
+QtGui/qundoview.h
 QtGui/qvalidator.h
 QtGui/qvboxlayout.h
 QtGui/qvfbhdr.h
 QtGui/qwhatsthis.h
+QtGui/qwidgetaction.h
 QtGui/qwidget.h
 QtGui/qwindowdefs.h
 QtGui/qwindowsstyle.h
@@ -237,14 +264,17 @@
 QtNetwork/qhostaddress.h
 QtNetwork/qhostinfo.h
 QtNetwork/qhttp.h
+QtNetwork/qnetworkinterface.h
 QtNetwork/qnetworkproxy.h
 QtNetwork/qtcpserver.h
 QtNetwork/qtcpsocket.h
 QtNetwork/qudpsocket.h
 QtNetwork/qurlinfo.h
 QtOpenGL/qglcolormap.h
+QtOpenGL/qglframebufferobject.h
 QtOpenGL/qgl.h
 QtOpenGL/qglpbuffer.h
+QtOpenGL/qglpixelbuffer.h
 Qt/qiconset.h
 QtSql/qsqldatabase.h
 QtSql/qsqldriver.h
@@ -257,6 +287,7 @@
 QtSql/qsqlquerymodel.h
 QtSql/qsqlrecord.h
 QtSql/qsqlrelationaldelegate.h
+QtSql/qsqlrelationaltablemodel.h
 QtSql/qsqlrelation.h
 QtSql/qsqlresult.h
 QtSql/qsqltablemodel.h
--- trunk/KDE/kdebindings/smoke/qt/qtdbus_header_list #558417:558418
@@ -1,14 +1,12 @@
-dbus-1.0/dbus/qdbusabstractadaptor.h
-dbus-1.0/dbus/qdbusabstractinterface.h
-dbus-1.0/dbus/qdbusbus.h
-dbus-1.0/dbus/qdbusconnection.h
-dbus-1.0/dbus/qdbuserror.h
-dbus-1.0/dbus/qdbus.h
-dbus-1.0/dbus/qdbusinterface.h
-dbus-1.0/dbus/qdbusmacros.h
-dbus-1.0/dbus/qdbusmessage.h
-dbus-1.0/dbus/qdbusreply.h
-dbus-1.0/dbus/qdbusserver.h
-dbus-1.0/dbus/qdbustypehelper_p.h
-dbus-1.0/dbus/qdbusutil.h
-
+QtDBus/qdbusabstractadaptor.h
+QtDBus/qdbusabstractinterface.h
+QtDBus/qdbusconnection.h
+QtDBus/qdbusconnectioninterface.h
+QtDBus/qdbuserror.h
+QtDBus/qdbusextratypes.h
+QtDBus/qdbusinterface.h
+QtDBus/qdbusmacros.h
+QtDBus/qdbusmessage.h
+QtDBus/qdbusmetatype.h
+QtDBus/qdbusreply.h
+QtDBus/qdbusserver.h

More information about the Kde-bindings mailing list