[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit f890904351427b1fbca306e4cca8e2aa8d42b99a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 19 22:33:10 2001 +0000

    Started making modifications that will move us towards a working Qt
    layer. This includes adding many temporary _q<foo> files that are mostly
    "borrowed" from Qt for the time being. So far, some basic leaf classes,
    and some string stuff is ready and working.
    
    These tests begin to support this effort.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/kwq/tests/qt/Makefile.in
similarity index 84%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/kwq/tests/qt/Makefile.in
index b6631c3..8ed38d8 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/kwq/tests/qt/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,10 +19,10 @@ CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
 OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = lib_qt.a
+PROGRAM = test
 
 CLEAN_FILES = *.o \
-    *.a \
+    $(PROGRAM) \
     $(NULL)
 
 #----------------------------------------------------------------------
@@ -34,20 +34,25 @@ CXXFLAGS = $(BASECXXFLAGS) \
     -DQT_NO_DATASTREAM \
     -D_KWQ_COMPLETE_ \
     -D_KWQ_IOSTREAM_ \
-    -I.. \
+    -I../../qt \
+    -I../.. \
     -I. \
     $(NULL)
 
+LDFLAGS = $(BASELDFLAGS) \
+    -L../../qt \
+    -l_qt \
+    $(NULL)
+
 DEPFLAGS = $(CXXFLAGS)
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(PROGRAM)
 
-$(LIBRARY): $(OBJECTS)
-	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
-	$(RANLIB) $(LIBRARY)
+$(PROGRAM): $(OBJECTS)
+	$(CXX) -o $@ $< $(LDFLAGS)
 
 depend:
 
diff --git a/WebCore/kwq/tests/qt/test.cpp b/WebCore/kwq/tests/qt/test.cpp
new file mode 100644
index 0000000..9a8396a
--- /dev/null
+++ b/WebCore/kwq/tests/qt/test.cpp
@@ -0,0 +1,39 @@
+#include <iostream>
+
+#if 0
+#include "qsize.h"
+#include "qrect.h"
+#include "qcstring.h"
+#endif 
+
+#include "qstring.h"
+
+int main() {
+
+#if 0    
+    QSize s1 = QSize(3,3);
+    QSize s2 = QSize(s1);
+    cout << (s1 == s2) << endl;
+    s2.setHeight(5);
+    cout << (s1) << endl;
+    cout << (s2) << endl;
+
+    cout << "--------------------------------------------" << endl;
+
+    QRect r1 = QRect(5,5,10,10);
+    QRect r2 = QRect(20,20,10,10);
+    QRect r3 = r1.intersect(r2);
+
+    cout << (r1) << endl;
+    cout << (r2) << endl;
+    cout << (r3) << endl;
+    cout << (r1.intersects(r2)) << endl;
+    cout << (r1.intersects(r3)) << endl;
+
+    cout << "--------------------------------------------" << endl;
+#endif
+
+    QString s = "foo";
+    
+    cout << s << endl;
+}
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kwq/tests/qt/Makefile.in
similarity index 84%
copy from WebCore/src/kwq/qt/Makefile.in
copy to WebCore/src/kwq/tests/qt/Makefile.in
index b6631c3..8ed38d8 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kwq/tests/qt/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,10 +19,10 @@ CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
 OBJECTS = $(CXXOBJECTS)
 
-LIBRARY = lib_qt.a
+PROGRAM = test
 
 CLEAN_FILES = *.o \
-    *.a \
+    $(PROGRAM) \
     $(NULL)
 
 #----------------------------------------------------------------------
@@ -34,20 +34,25 @@ CXXFLAGS = $(BASECXXFLAGS) \
     -DQT_NO_DATASTREAM \
     -D_KWQ_COMPLETE_ \
     -D_KWQ_IOSTREAM_ \
-    -I.. \
+    -I../../qt \
+    -I../.. \
     -I. \
     $(NULL)
 
+LDFLAGS = $(BASELDFLAGS) \
+    -L../../qt \
+    -l_qt \
+    $(NULL)
+
 DEPFLAGS = $(CXXFLAGS)
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(PROGRAM)
 
-$(LIBRARY): $(OBJECTS)
-	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
-	$(RANLIB) $(LIBRARY)
+$(PROGRAM): $(OBJECTS)
+	$(CXX) -o $@ $< $(LDFLAGS)
 
 depend:
 
diff --git a/WebCore/src/kwq/tests/qt/test.cpp b/WebCore/src/kwq/tests/qt/test.cpp
new file mode 100644
index 0000000..9a8396a
--- /dev/null
+++ b/WebCore/src/kwq/tests/qt/test.cpp
@@ -0,0 +1,39 @@
+#include <iostream>
+
+#if 0
+#include "qsize.h"
+#include "qrect.h"
+#include "qcstring.h"
+#endif 
+
+#include "qstring.h"
+
+int main() {
+
+#if 0    
+    QSize s1 = QSize(3,3);
+    QSize s2 = QSize(s1);
+    cout << (s1 == s2) << endl;
+    s2.setHeight(5);
+    cout << (s1) << endl;
+    cout << (s2) << endl;
+
+    cout << "--------------------------------------------" << endl;
+
+    QRect r1 = QRect(5,5,10,10);
+    QRect r2 = QRect(20,20,10,10);
+    QRect r3 = r1.intersect(r2);
+
+    cout << (r1) << endl;
+    cout << (r2) << endl;
+    cout << (r3) << endl;
+    cout << (r1.intersects(r2)) << endl;
+    cout << (r1.intersects(r3)) << endl;
+
+    cout << "--------------------------------------------" << endl;
+#endif
+
+    QString s = "foo";
+    
+    cout << s << endl;
+}

-- 
WebKit Debian packaging