[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/dependencies/tqtinterface/qtinterface [BROKEN EMAIL]
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2010-07-31 19:56:02
Message-ID: 20100731195602.1BE00AC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157657 by tpearson:

Fixups for kdebindings


 M  +4 -3      Makefile.am  
 M  +10 -0     tqt.h  


--- branches/trinity/dependencies/tqtinterface/qtinterface/Makefile.am #1157656:1157657
@@ -34,7 +34,7 @@
 tqcanvas.cpp tqcdestyle.cpp tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp \
tqcommonstyle.cpp \  tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp tqdatetimeedit.cpp \
tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp \  \
                tqerrormessage.cpp tqeventloop.cpp \
-tqframe.cpp tqftp.cpp tqfiledialog.cpp \
+tqframe.cpp tqftp.cpp tqfiledialog.cpp tqfontdialog.cpp \
 tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp tqguardedptr.cpp \
 tqhbox.cpp tqhbuttongroup.cpp tqheader.cpp tqhgroupbox.cpp tqhttp.cpp \
 tqiconview.cpp tqimageformatplugin.cpp tqinputcontext.cpp tqinputdialog.cpp \
@@ -82,7 +82,7 @@
 tqcanvas.h tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
 tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h \
tqdns.h tqdockarea.h tqdockwindow.h tqdragobject.h \  tqerrormessage.h tqeventloop.h \
-tqfiledialog.h tqframe.h tqftp.h \
+tqfiledialog.h tqfontdialog.h tqframe.h tqftp.h \
 tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h tqguardedptr.h \
 tqhbox.h tqhbuttongroup.h tqheader.h tqhgroupbox.h tqhttp.h \
 tqiconview.h tqimageformatplugin.h tqinputcontext.h tqinputdialog.h \
@@ -135,6 +135,7 @@
 install-exec-local:
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
+	cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/mcopidl-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/dcopidl-tqt" "$(DESTDIR)$(bindir)/"
@@ -142,4 +143,4 @@
 	cp -Rp "$(srcdir)/dcopidl2cpp-tqt" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/convert_qt_tqt1" "$(DESTDIR)$(bindir)/"
 	cp -Rp "$(srcdir)/convert_qt_tqt2" "$(DESTDIR)$(bindir)/"
-	cp -Rp "$(srcdir)/convert_qt_tqt3" "$(DESTDIR)$(bindir)/"
\ No newline at end of file
+	cp -Rp "$(srcdir)/convert_qt_tqt3" "$(DESTDIR)$(bindir)/"
--- branches/trinity/dependencies/tqtinterface/qtinterface/tqt.h #1157656:1157657
@@ -29,6 +29,16 @@
 #define QT3_SUPPORT
 #endif
 
+#ifdef TQT_METHOD
+#undef TQT_METHOD
+#endif
+#ifdef TQT_SLOT
+#undef TQT_SLOT
+#endif
+#ifdef TQT_SIGNAL
+#undef TQT_SIGNAL
+#endif
+
 #ifdef __cplusplus
 #define TQT_METHOD(a)	METHOD(a)
 #define TQT_SLOT(a)	SLOT(a)


[prev in list] [next in list] [prev in thread] [next in thread]