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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebindings/smoke
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-12-06 18:00:26
Message-ID: 1133892026.831295.20238.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 486067 by ctennis:

Revert my previous changes, as they weren't in trunk

 M  +3 -4      kde/qtguess.pl.in  
 M  +1 -1      qt/generate.pl.in  
 M  +0 -26     qt/header_list  
 M  +3 -4      qt/qtguess.pl.in  


--- branches/KDE/3.5/kdebindings/smoke/kde/qtguess.pl.in #486066:486067
@@ -36,7 +36,6 @@
 
 my $tmp = gettmpfile();
 my $qtinc = '@qt_includes@';
-my $qtglobal = "$qtinc/Qt/qglobal.h";
 my $allinc = '@all_includes@';
 my $alllib = '@all_libraries@';
 my $qtflags ='@LIB_QT@';
@@ -53,7 +52,7 @@
 
 $qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
 
- -e "$qtglobal" or die "Invalid Qt directory.\n";
+ -e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n";
 
 my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
 
@@ -95,7 +94,7 @@
 
 sub grab_qglobal_symbols
 {
-	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtglobal 2>/dev/null";
+	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
 	my $symbols = `$cmd`;
         for(0..1)
         {
@@ -116,7 +115,7 @@
 	    elsif(! $_) # first try
 	    {
 		print  "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
-                $cmd = "$cc -E -dM -I$qtinc $qtglobal 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
--- branches/KDE/3.5/kdebindings/smoke/qt/generate.pl.in #486066:486067
@@ -115,7 +115,7 @@
 # List Qt headers, and exclude the ones listed above
 my @headers = ();
 
-$qtinc= '@qt_includes@/Qt';
+$qtinc= '@qt_includes@';
 opendir (QT, $qtinc) or die "Couldn't find $qtinc";
 foreach $filename (readdir(QT)) {
     $entry = $qtinc."/".$filename;
--- branches/KDE/3.5/kdebindings/smoke/qt/header_list #486066:486067
@@ -1,9 +1,5 @@
 q1xcompatibility.h
 qabstractlayout.h
-qabstractprintdialog.h
-qabstractscrollarea.h
-qabstractslider.h
-qabstractspinbox.h
 qaccel.h
 qaccessible.h
 qaction.h
@@ -15,8 +11,6 @@
 qassistantclient.h
 qasyncimageio.h
 qasyncio.h
-qatomic.h
-qbasictimer.h
 qbig5codec.h
 qbitarray.h
 qbitarry.h
@@ -26,11 +20,9 @@
 qbuffer.h
 qbuttongroup.h
 qbutton.h
-qbytearray.h
 qcache.h
 qcanvas.h
 qcdestyle.h
-qchar.h
 qcheckbox.h
 qchkbox.h
 qcleanuphandler.h
@@ -48,7 +40,6 @@
 qconfig.h
 qconnect.h
 qconnection.h
-qcoreapplication.h
 qcstring.h
 qcursor.h
 qdatabrowser.h
@@ -79,7 +70,6 @@
 qeuckrcodec.h
 qevent.h
 qeventloop.h
-qfactoryinterface.h
 qfeatures.h
 qfiledef.h
 qfiledialog.h
@@ -122,7 +112,6 @@
 qhgroupbox.h
 qhostaddress.h
 qhttp.h
-qicon.h
 qiconset.h
 qiconview.h
 qimageformatplugin.h
@@ -140,13 +129,10 @@
 qkeysequence.h
 qlabel.h
 qlayout.h
-qlayoutitem.h
 qlcdnumber.h
 qlcdnum.h
 qlocale.h
 qlibrary.h
-qline.h
-qlinef.h
 qlined.h
 qlineedit.h
 qlistbox.h
@@ -155,7 +141,6 @@
 qlocalfs.h
 qmainwindow.h
 qmap.h
-qmatrix.h
 qmemarray.h
 qmenubar.h
 qmenudata.h
@@ -204,8 +189,6 @@
 qpntarry.h
 qpointarray.h
 qpoint.h
-qpolygon.h
-qpolygonf.h
 qpolygonscanner.h
 qpopmenu.h
 qpopupmenu.h
@@ -302,17 +285,8 @@
 qtextcodecfactory.h
 qtextcodec.h
 qtextcodecplugin.h
-qtextcursor.h
-qtextdocument.h
-qtextdocumentfragment.h
 qtextedit.h
-qtextformat.h
-qtextlayout.h
-qtextlist.h
-qtextobject.h
-qtextoption.h
 qtextstream.h
-qtexttable.h
 qtextview.h
 qt.h
 qthread.h
--- branches/KDE/3.5/kdebindings/smoke/qt/qtguess.pl.in #486066:486067
@@ -36,7 +36,6 @@
 
 my $tmp = gettmpfile();
 my $qtinc = '@qt_includes@';
-my $qtglobal = "$qtinc/Qt/qglobal.h";
 my $allinc = '@all_includes@';
 my $alllib = '@all_libraries@';
 my $qtflags ='@LIB_QT@';
@@ -53,7 +52,7 @@
 
 $qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
 
- -e "$qtglobal" or die "Invalid Qt directory.\n";
+ -e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n";
 
 my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
 
@@ -95,7 +94,7 @@
 
 sub grab_qglobal_symbols
 {
-	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtglobal 2>/dev/null";
+	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
 	my $symbols = `$cmd`;
         for(0..1)
         {
@@ -116,7 +115,7 @@
 	    elsif(! $_) # first try
 	    {
 		print  "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
-                $cmd = "$cc -E -dM -I$qtinc $qtglobal 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
[prev in list] [next in list] [prev in thread] [next in thread]