some patches for Qt 3.2

This commit is contained in:
brad 2003-12-08 02:14:11 +00:00
parent 7b480ca8f5
commit a81ca317ca
4 changed files with 120 additions and 4 deletions

View File

@ -1,7 +1,15 @@
$OpenBSD: patch-smoke_qt_generate_pl,v 1.2 2003/06/12 19:16:15 espie Exp $
--- smoke/qt/generate.pl.orig Wed May 7 13:44:40 2003
+++ smoke/qt/generate.pl Wed Jun 11 11:25:30 2003
@@ -61,7 +61,11 @@ my %excludes = (
$OpenBSD: patch-smoke_qt_generate_pl,v 1.3 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/generate.pl.orig 2003-05-07 07:44:40.000000000 -0400
+++ smoke/qt/generate.pl 2003-11-22 17:19:01.000000000 -0500
@@ -51,6 +51,7 @@ my %excludes = (
'qassistantclient.h' => 1, # Part of assistant lib, not of qt
'qsharedmemory.h' => 1, # "not part of the Qt API" they say
'qwindowsstyle.h' => 1, # Qt windowsstlye, plugin
+ 'qcompactstyle.h' => 1, # Qt windowsstlye, plugin
'qmotifstyle.h' => 1,
'qmotifplusstyle.h' => 1,
'qsgistyle.h' => 1,
@@ -61,7 +62,11 @@ my %excludes = (
# List Qt headers, and exclude the ones listed above
my @headers = ();

View File

@ -0,0 +1,66 @@
$OpenBSD: patch-smoke_qt_x_QFont_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_QFont.cpp.orig 2003-01-04 04:59:24.000000000 -0500
+++ smoke/qt/x_QFont.cpp 2003-11-22 17:19:34.000000000 -0500
@@ -233,25 +233,56 @@ public:
x[0].s_enum = (long)QFont::NoScript;
}
static void x_75(Smoke::Stack x) {
+#if QT_VERSION < 0x030200
x[0].s_enum = (long)QFont::HanX11;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_76(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinBasic;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinBasic;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_77(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_2;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_2;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_78(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_3;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_3;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_79(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_4;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_4;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_80(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_14;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_14;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_81(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_15;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_15;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_82(Smoke::Stack x) {
x[0].s_enum = (long)QFont::KatakanaHalfWidth;

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-smoke_qt_x_QHBox_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_QHBox.cpp.orig 2003-01-16 05:03:52.000000000 -0500
+++ smoke/qt/x_QHBox.cpp 2003-11-22 17:19:42.000000000 -0500
@@ -143,14 +143,22 @@ public:
x_QHBox* xret = new x_QHBox((bool)x[1].s_bool,(QWidget*)x[2].s_class);
x[0].s_class = (void*)xret;
}
+#if QT_VERSION < 0x030200
x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2) {
+#else
+ x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2, 0) {
+#endif
}
static void x_22(Smoke::Stack x) {
// QHBox(bool)
x_QHBox* xret = new x_QHBox((bool)x[1].s_bool);
x[0].s_class = (void*)xret;
}
+#if QT_VERSION < 0x030200
x_QHBox(bool x1) : QHBox(x1) {
+#else
+ x_QHBox(bool x1) : QHBox(x1, 0, 0) {
+#endif
}
void x_23(Smoke::Stack x) {
// frameChanged()

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-smoke_qt_x_Qt_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_Qt.cpp.orig 2003-03-04 09:33:32.000000000 -0500
+++ smoke/qt/x_Qt.cpp 2003-11-22 17:19:48.000000000 -0500
@@ -155,7 +155,11 @@ public:
x[0].s_enum = (long)Qt::WState_Reserved1;
}
static void x_49(Smoke::Stack x) {
- x[0].s_enum = (long)Qt::WState_Reserved2;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long) Qt::WState_Reserved2;
+#else
+ x[0].s_enum = (long) Qt::WState_OwnSizePolicy;
+#endif
}
static void x_50(Smoke::Stack x) {
x[0].s_enum = (long)Qt::WState_CreatedHidden;