From 7d5e0083d4091ea4e0d529c22e8f86849ce757c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Thu, 23 Jul 2009 22:48:59 +0000 Subject: [PATCH] [GB.QT4.WEBKIT] * BUG: Make it compile with Qt 4.4 by redirecting the Zoom property to the TextZoom property. git-svn-id: svn://localhost/gambas/trunk@2154 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- gb.qt4/src/webkit/cwebview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gb.qt4/src/webkit/cwebview.cpp b/gb.qt4/src/webkit/cwebview.cpp index 83b24001b..f051dd4a2 100644 --- a/gb.qt4/src/webkit/cwebview.cpp +++ b/gb.qt4/src/webkit/cwebview.cpp @@ -95,6 +95,7 @@ BEGIN_PROPERTY(WebView_SelectedText) END_PROPERTY +#if QT_VERSION >= QT_VERSION_CHECK(4, 5, 0) BEGIN_PROPERTY(WebView_Zoom) if (READ_PROPERTY) @@ -103,6 +104,7 @@ BEGIN_PROPERTY(WebView_Zoom) WIDGET->setZoomFactor(VPROP(GB_FLOAT)); END_PROPERTY +#endif BEGIN_PROPERTY(WebView_TextZoom) @@ -163,7 +165,11 @@ GB_DESC CWebViewDesc[] = GB_PROPERTY_READ("Text", "s", WebView_Text), GB_PROPERTY_READ("Icon", "Picture", WebView_Icon), GB_PROPERTY_READ("SelectedText", "s", WebView_SelectedText), + #if QT_VERSION >= QT_VERSION_CHECK(4, 5, 0) GB_PROPERTY("Zoom", "f", WebView_Zoom), + #else + GB_PROPERTY("Zoom", "f", WebView_TextZoom), + #endif GB_PROPERTY("TextZoom", "f", WebView_TextZoom), GB_PROPERTY_READ("Title", "s", WebView_Title),