[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:48:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f8d406f98903d79b91a2fba008aee5d44b2f9a79
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 4 01:23:08 2001 +0000
Simple linkage test app.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@266 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..5414960
Binary files /dev/null and b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings differ
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
new file mode 100644
index 0000000..b9b4b09
--- /dev/null
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
@@ -0,0 +1,4 @@
+{
+ IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
+ IBVersion = 1;
+}
\ No newline at end of file
diff --git a/WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
similarity index 70%
copy from WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib
copy to WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
index ba73594..5b75dbf 100644
--- a/WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,7 @@
<plist version="0.9">
<dict>
<key>IBFramework Version</key>
- <string>219.0</string>
- <key>IBMainMenuLocation</key>
- <string>69 252 318 44 0 0 1600 1002 </string>
- <key>IBSystem Version</key>
- <string>5G64</string>
+ <string>205.0</string>
<key>IBUserGuides</key>
<dict>
<key>Window</key>
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib
new file mode 100644
index 0000000..a68caa7
Binary files /dev/null and b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
similarity index 79%
copy from WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
copy to WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index d5fa309..d46854c 100644
--- a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -90,7 +90,7 @@
//174
17587328FF379C6511CA2CBB = {
isa = PBXApplicationReference;
- path = drawApp.app;
+ path = WebViewTest.app;
refType = 3;
};
//170
@@ -142,13 +142,13 @@
19C28FACFE9D520D11CA2CBB,
);
isa = PBXGroup;
- name = drawApp;
+ name = WebViewTest;
path = "";
refType = 4;
};
29B97315FDCFA39411CA2CEA = {
children = (
- 9C00349001601F7F0ECA16EA,
+ 9CE32C34016BAA500ECA16EA,
);
isa = PBXGroup;
name = "Other Sources";
@@ -159,9 +159,6 @@
children = (
29B97318FDCFA39411CA2CEA,
089C165CFE840E0CC02AAC07,
- 9C00349401627E910ECA16EA,
- 9C00349501627E910ECA16EA,
- 9C00349601627E910ECA16EA,
);
isa = PBXGroup;
name = Resources;
@@ -217,9 +214,9 @@
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../..";
- OTHER_LDFLAGS = " -L../../.. -L../../../qt -lkwq -l_qt -lstdc++";
- PRODUCT_NAME = drawApp;
+ OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
+ OTHER_LDFLAGS = "-L../../../../.. -L../../.. -L../../../qt -lkde -lkwq -l_qt -lstdc++ -ljpeg";
+ PRODUCT_NAME = WebViewTest;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
WRAPPER_EXTENSION = app;
@@ -227,9 +224,9 @@
dependencies = (
);
isa = PBXApplicationTarget;
- name = drawApp;
+ name = WebViewTest;
productInstallPath = "$(HOME)/Applications";
- productName = drawApp;
+ productName = WebViewTest;
productReference = 17587328FF379C6511CA2CBB;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
@@ -238,7 +235,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>drawApp</string>
+ <string>WebViewTest</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -252,7 +249,7 @@
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
- <string>_KWQOwner</string>
+ <string>NSApplication</string>
</dict>
</plist>
";
@@ -270,9 +267,6 @@
files = (
080E96DCFE201CFB7F000001,
089C165EFE840E0CC02AAC07,
- 9C00349701627E910ECA16EA,
- 9C00349801627E910ECA16EA,
- 9C00349901627E910ECA16EA,
);
isa = PBXResourcesBuildPhase;
name = "Bundle Resources";
@@ -280,7 +274,7 @@
29B9732BFDCFA39411CA2CEA = {
buildActionMask = 2147483647;
files = (
- 9C00349101601F7F0ECA16EA,
+ 9CE32C35016BAA500ECA16EA,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -332,50 +326,14 @@
//9C2
//9C3
//9C4
- 9C00349001601F7F0ECA16EA = {
+ 9CE32C34016BAA500ECA16EA = {
isa = PBXFileReference;
name = draw.mm;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/draw.mm;
+ path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/khtmlview/draw.mm;
refType = 0;
};
- 9C00349101601F7F0ECA16EA = {
- fileRef = 9C00349001601F7F0ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349401627E910ECA16EA = {
- isa = PBXFileReference;
- name = powermac.jpg;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/powermac.jpg;
- refType = 0;
- };
- 9C00349501627E910ECA16EA = {
- isa = PBXFileReference;
- name = qt.png;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/qt.png;
- refType = 0;
- };
- 9C00349601627E910ECA16EA = {
- isa = PBXFileReference;
- name = yahoo.gif;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/yahoo.gif;
- refType = 0;
- };
- 9C00349701627E910ECA16EA = {
- fileRef = 9C00349401627E910ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349801627E910ECA16EA = {
- fileRef = 9C00349501627E910ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349901627E910ECA16EA = {
- fileRef = 9C00349601627E910ECA16EA;
+ 9CE32C35016BAA500ECA16EA = {
+ fileRef = 9CE32C34016BAA500ECA16EA;
isa = PBXBuildFile;
settings = {
};
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/tests/khtmlview/draw.mm
similarity index 78%
copy from WebCore/kwq/KWQDrawUtil.h
copy to WebCore/kwq/tests/khtmlview/draw.mm
index 20ca608..5dcb8bc 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/kwq/tests/khtmlview/draw.mm
@@ -23,18 +23,26 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDRAWUTIL_H_
-#define QDRAWUTIL_H_
+#include <qapplication.h>
+#include <khtmlview.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
+// Voodoo required to get compiler to compile correctly.
+#undef DEBUG
+#import <Cocoa/Cocoa.h>
-void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+//
+// Create and display our widget.
+//
-#endif
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ KHTMLView *htmlView = new KHTMLView (0,0);
+ app.setMainWidget( htmlView );
+ htmlView->show();
+ return app.exec();
+}
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..5414960
Binary files /dev/null and b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/InfoPlist.strings differ
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
new file mode 100644
index 0000000..b9b4b09
--- /dev/null
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
@@ -0,0 +1,4 @@
+{
+ IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
+ IBVersion = 1;
+}
\ No newline at end of file
diff --git a/WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
similarity index 70%
copy from WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib
copy to WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
index ba73594..5b75dbf 100644
--- a/WebCore/kwq/tests/draw/drawApp/English.lproj/MainMenu.nib/info.nib
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,7 @@
<plist version="0.9">
<dict>
<key>IBFramework Version</key>
- <string>219.0</string>
- <key>IBMainMenuLocation</key>
- <string>69 252 318 44 0 0 1600 1002 </string>
- <key>IBSystem Version</key>
- <string>5G64</string>
+ <string>205.0</string>
<key>IBUserGuides</key>
<dict>
<key>Window</key>
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib
new file mode 100644
index 0000000..a68caa7
Binary files /dev/null and b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
similarity index 79%
copy from WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
copy to WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index d5fa309..d46854c 100644
--- a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -90,7 +90,7 @@
//174
17587328FF379C6511CA2CBB = {
isa = PBXApplicationReference;
- path = drawApp.app;
+ path = WebViewTest.app;
refType = 3;
};
//170
@@ -142,13 +142,13 @@
19C28FACFE9D520D11CA2CBB,
);
isa = PBXGroup;
- name = drawApp;
+ name = WebViewTest;
path = "";
refType = 4;
};
29B97315FDCFA39411CA2CEA = {
children = (
- 9C00349001601F7F0ECA16EA,
+ 9CE32C34016BAA500ECA16EA,
);
isa = PBXGroup;
name = "Other Sources";
@@ -159,9 +159,6 @@
children = (
29B97318FDCFA39411CA2CEA,
089C165CFE840E0CC02AAC07,
- 9C00349401627E910ECA16EA,
- 9C00349501627E910ECA16EA,
- 9C00349601627E910ECA16EA,
);
isa = PBXGroup;
name = Resources;
@@ -217,9 +214,9 @@
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../..";
- OTHER_LDFLAGS = " -L../../.. -L../../../qt -lkwq -l_qt -lstdc++";
- PRODUCT_NAME = drawApp;
+ OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
+ OTHER_LDFLAGS = "-L../../../../.. -L../../.. -L../../../qt -lkde -lkwq -l_qt -lstdc++ -ljpeg";
+ PRODUCT_NAME = WebViewTest;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
WRAPPER_EXTENSION = app;
@@ -227,9 +224,9 @@
dependencies = (
);
isa = PBXApplicationTarget;
- name = drawApp;
+ name = WebViewTest;
productInstallPath = "$(HOME)/Applications";
- productName = drawApp;
+ productName = WebViewTest;
productReference = 17587328FF379C6511CA2CBB;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
@@ -238,7 +235,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>drawApp</string>
+ <string>WebViewTest</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -252,7 +249,7 @@
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
- <string>_KWQOwner</string>
+ <string>NSApplication</string>
</dict>
</plist>
";
@@ -270,9 +267,6 @@
files = (
080E96DCFE201CFB7F000001,
089C165EFE840E0CC02AAC07,
- 9C00349701627E910ECA16EA,
- 9C00349801627E910ECA16EA,
- 9C00349901627E910ECA16EA,
);
isa = PBXResourcesBuildPhase;
name = "Bundle Resources";
@@ -280,7 +274,7 @@
29B9732BFDCFA39411CA2CEA = {
buildActionMask = 2147483647;
files = (
- 9C00349101601F7F0ECA16EA,
+ 9CE32C35016BAA500ECA16EA,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -332,50 +326,14 @@
//9C2
//9C3
//9C4
- 9C00349001601F7F0ECA16EA = {
+ 9CE32C34016BAA500ECA16EA = {
isa = PBXFileReference;
name = draw.mm;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/draw.mm;
+ path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/khtmlview/draw.mm;
refType = 0;
};
- 9C00349101601F7F0ECA16EA = {
- fileRef = 9C00349001601F7F0ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349401627E910ECA16EA = {
- isa = PBXFileReference;
- name = powermac.jpg;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/powermac.jpg;
- refType = 0;
- };
- 9C00349501627E910ECA16EA = {
- isa = PBXFileReference;
- name = qt.png;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/qt.png;
- refType = 0;
- };
- 9C00349601627E910ECA16EA = {
- isa = PBXFileReference;
- name = yahoo.gif;
- path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/yahoo.gif;
- refType = 0;
- };
- 9C00349701627E910ECA16EA = {
- fileRef = 9C00349401627E910ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349801627E910ECA16EA = {
- fileRef = 9C00349501627E910ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 9C00349901627E910ECA16EA = {
- fileRef = 9C00349601627E910ECA16EA;
+ 9CE32C35016BAA500ECA16EA = {
+ fileRef = 9CE32C34016BAA500ECA16EA;
isa = PBXBuildFile;
settings = {
};
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/src/kwq/tests/khtmlview/draw.mm
similarity index 78%
copy from WebCore/kwq/KWQDrawUtil.h
copy to WebCore/src/kwq/tests/khtmlview/draw.mm
index 20ca608..5dcb8bc 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/src/kwq/tests/khtmlview/draw.mm
@@ -23,18 +23,26 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDRAWUTIL_H_
-#define QDRAWUTIL_H_
+#include <qapplication.h>
+#include <khtmlview.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
+// Voodoo required to get compiler to compile correctly.
+#undef DEBUG
+#import <Cocoa/Cocoa.h>
-void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+//
+// Create and display our widget.
+//
-#endif
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ KHTMLView *htmlView = new KHTMLView (0,0);
+ app.setMainWidget( htmlView );
+ htmlView->show();
+ return app.exec();
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list