summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
committer mickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
commit0bc169b13ad563819b6483beef775be26016832b (patch) (side-by-side diff)
tree004ef63126b46ce1b9a18bf5403fe9ce9c256465
parent896d2e77ebafd09ee58d6148e31365f47a3668b4 (diff)
downloadopie-0bc169b13ad563819b6483beef775be26016832b.zip
opie-0bc169b13ad563819b6483beef775be26016832b.tar.gz
opie-0bc169b13ad563819b6483beef775be26016832b.tar.bz2
work around qt_version() bug in Qt/Embedded 2.3.10
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--libopie2/opieui/ofontselector.cpp2
-rw-r--r--libopie2/opieui/opieui.pro2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 824e749..a2d3011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,12 +9,13 @@
* #1536 - Autosave of custom locations in opie backup (ar)
* #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
* #1540 - Implemented deletion of DocLnks in opie-eye
Internal
--------
+ * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
2005-02-03 Opie 1.1.9
New Features
------------
* Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index 6c24f14..8b679c8 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -149,13 +149,13 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
d->m_font_size_list = new QComboBox( this, "SizeListBox" );
connect( d->m_font_size_list, SIGNAL( activated(int) ),
this, SLOT( fontSizeClicked(int) ) );
gridLayout->addWidget( d->m_font_size_list, 3, 1 );
- d->m_pointbug = ( qt_version() <= 233 );
+ d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2
if ( withpreview )
{
d->m_preview = new QMultiLineEdit ( this, "Preview" );
d->m_preview->setAlignment ( AlignCenter );
d->m_preview->setWordWrap ( QMultiLineEdit::WidgetWidth );
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index ffa8b83..5525ea2 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -45,13 +45,13 @@ SOURCES = oclickablelabel.cpp \
include( big-screen/big-screen.pro )
include( fileselector/fileselector.pro )
INTERFACES = otimepickerbase.ui
TARGET = opieui2
-VERSION = 1.9.0
+VERSION = 1.9.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lopiecore2