[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c35957b252f7c660df12b8124c51d686d80c239e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 19 08:58:19 2002 +0000
* src/kdelibs/kjs/Makefile.am: Fix testkjs build.
Fix a couple more static initialization problems:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
* src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
* src/.cvsignore, src/kdelibs/.cvsignore,
src/kdelibs/khtml/css/.cvsignore,
src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
Ignore stamp files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@550 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 5db974e..3006122 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -1,8 +1,8 @@
NULL =
noinst_LIBRARIES = libkjs.o
-LDFLAGS = -Wl,-r -nostdlib
-libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkjs_o_LDFLAGS = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
libkjs_o_SOURCES = \
array_object.cpp \
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 466bafe..51abc6b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-01-19 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kdelibs/kjs/Makefile.am: Fix testkjs build.
+
+ Fix a couple more static initialization problems:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
+ * src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
+
+ * src/.cvsignore, src/kdelibs/.cvsignore,
+ src/kdelibs/khtml/css/.cvsignore,
+ src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
+ Ignore stamp files.
+
2002-01-18 Richard Williamson <rjw at apple.com>
First pass at new view/datasource/controller API.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 466bafe..51abc6b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-01-19 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kdelibs/kjs/Makefile.am: Fix testkjs build.
+
+ Fix a couple more static initialization problems:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
+ * src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
+
+ * src/.cvsignore, src/kdelibs/.cvsignore,
+ src/kdelibs/khtml/css/.cvsignore,
+ src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
+ Ignore stamp files.
+
2002-01-18 Richard Williamson <rjw at apple.com>
First pass at new view/datasource/controller API.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 466bafe..51abc6b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-01-19 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kdelibs/kjs/Makefile.am: Fix testkjs build.
+
+ Fix a couple more static initialization problems:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
+ * src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
+
+ * src/.cvsignore, src/kdelibs/.cvsignore,
+ src/kdelibs/khtml/css/.cvsignore,
+ src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
+ Ignore stamp files.
+
2002-01-18 Richard Williamson <rjw at apple.com>
First pass at new view/datasource/controller API.
diff --git a/WebCore/khtml/css/.cvsignore b/WebCore/khtml/css/.cvsignore
index 8a3fb20..3c0f24c 100644
--- a/WebCore/khtml/css/.cvsignore
+++ b/WebCore/khtml/css/.cvsignore
@@ -8,6 +8,4 @@ cssproperties.c
cssproperties.strip
cssproperties.h
.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
+*-stamp
diff --git a/WebCore/khtml/misc/.cvsignore b/WebCore/khtml/misc/.cvsignore
index bdc1485..b0f734a 100644
--- a/WebCore/khtml/misc/.cvsignore
+++ b/WebCore/khtml/misc/.cvsignore
@@ -8,6 +8,4 @@ htmlattrs.c
htmlattrs.h
htmlattrs.gperf
.deps
-.libs
-*.lo
-*.la
+*-stamp
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 03b98f8..c8cb400 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
-static const QCursor staticURLCursor = QCursor();
+static const QCursor *staticURLCursor = NULL;
+
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
- return staticURLCursor;
+ if (staticURLCursor == NULL) {
+ staticURLCursor = new QCursor();
+ }
+ return *staticURLCursor;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 03b98f8..c8cb400 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
-static const QCursor staticURLCursor = QCursor();
+static const QCursor *staticURLCursor = NULL;
+
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
- return staticURLCursor;
+ if (staticURLCursor == NULL) {
+ staticURLCursor = new QCursor();
+ }
+ return *staticURLCursor;
}
diff --git a/WebCore/kwq/KWQRegion.mm b/WebCore/kwq/KWQRegion.mm
index f66bb3d..7ae4048 100644
--- a/WebCore/kwq/KWQRegion.mm
+++ b/WebCore/kwq/KWQRegion.mm
@@ -37,8 +37,9 @@ void QRegion::_initialize() {
QRegion::QRegion()
{
_initialize();
+
// Create lazily - RJW
- //data->path = [[NSBezierPath bezierPath] retain];
+ //data->path = [[NSBezierPath alloc] init];
}
QRegion::QRegion(const QRect &rect)
@@ -78,7 +79,7 @@ QRegion::QRegion(const QPointArray &arr)
QRegion::QRegion(const QRegion &other)
{
_initialize();
- data->path = [[NSBezierPath bezierPath] retain];
+ data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
}
@@ -118,7 +119,7 @@ QRegion &QRegion::operator=(const QRegion &other)
if (data->path) {
[data->path release];
}
- data->path = [[NSBezierPath bezierPath] retain];
+ data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
return *this;
}
diff --git a/WebCore/src/.cvsignore b/WebCore/src/.cvsignore
index 8417b30..b14daba 100644
--- a/WebCore/src/.cvsignore
+++ b/WebCore/src/.cvsignore
@@ -1,5 +1,5 @@
Makefile.in
Makefile
.deps
-.libs
*.dylib
+*-stamp
diff --git a/WebCore/src/kdelibs/.cvsignore b/WebCore/src/kdelibs/.cvsignore
index 3dda729..d379ec2 100644
--- a/WebCore/src/kdelibs/.cvsignore
+++ b/WebCore/src/kdelibs/.cvsignore
@@ -1,2 +1,3 @@
Makefile.in
Makefile
+*-stamp
diff --git a/WebCore/src/kdelibs/khtml/css/.cvsignore b/WebCore/src/kdelibs/khtml/css/.cvsignore
index 8a3fb20..3c0f24c 100644
--- a/WebCore/src/kdelibs/khtml/css/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/css/.cvsignore
@@ -8,6 +8,4 @@ cssproperties.c
cssproperties.strip
cssproperties.h
.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
+*-stamp
diff --git a/WebCore/src/kdelibs/khtml/misc/.cvsignore b/WebCore/src/kdelibs/khtml/misc/.cvsignore
index bdc1485..b0f734a 100644
--- a/WebCore/src/kdelibs/khtml/misc/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/misc/.cvsignore
@@ -8,6 +8,4 @@ htmlattrs.c
htmlattrs.h
htmlattrs.gperf
.deps
-.libs
-*.lo
-*.la
+*-stamp
diff --git a/WebCore/src/kdelibs/kjs/.cvsignore b/WebCore/src/kdelibs/kjs/.cvsignore
index 2c167c6..655c54e 100644
--- a/WebCore/src/kdelibs/kjs/.cvsignore
+++ b/WebCore/src/kdelibs/kjs/.cvsignore
@@ -5,6 +5,4 @@ grammar.cpp
grammar.cpp.h
grammar.h
.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
+*-stamp
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
index 5db974e..3006122 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -1,8 +1,8 @@
NULL =
noinst_LIBRARIES = libkjs.o
-LDFLAGS = -Wl,-r -nostdlib
-libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libkjs_o_LDFLAGS = -Wl,-r -nostdlib
+libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
libkjs_o_SOURCES = \
array_object.cpp \
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 03b98f8..c8cb400 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
-static const QCursor staticURLCursor = QCursor();
+static const QCursor *staticURLCursor = NULL;
+
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
- return staticURLCursor;
+ if (staticURLCursor == NULL) {
+ staticURLCursor = new QCursor();
+ }
+ return *staticURLCursor;
}
diff --git a/WebCore/src/kwq/KWQRegion.mm b/WebCore/src/kwq/KWQRegion.mm
index f66bb3d..7ae4048 100644
--- a/WebCore/src/kwq/KWQRegion.mm
+++ b/WebCore/src/kwq/KWQRegion.mm
@@ -37,8 +37,9 @@ void QRegion::_initialize() {
QRegion::QRegion()
{
_initialize();
+
// Create lazily - RJW
- //data->path = [[NSBezierPath bezierPath] retain];
+ //data->path = [[NSBezierPath alloc] init];
}
QRegion::QRegion(const QRect &rect)
@@ -78,7 +79,7 @@ QRegion::QRegion(const QPointArray &arr)
QRegion::QRegion(const QRegion &other)
{
_initialize();
- data->path = [[NSBezierPath bezierPath] retain];
+ data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
}
@@ -118,7 +119,7 @@ QRegion &QRegion::operator=(const QRegion &other)
if (data->path) {
[data->path release];
}
- data->path = [[NSBezierPath bezierPath] retain];
+ data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
return *this;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list