summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
committer mickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
commit0bc169b13ad563819b6483beef775be26016832b (patch) (unidiff)
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) (ignore 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 @@
9 * #1536 - Autosave of custom locations in opie backup (ar) 9 * #1536 - Autosave of custom locations in opie backup (ar)
10 * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) 10 * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
11 * #1540 - Implemented deletion of DocLnks in opie-eye 11 * #1540 - Implemented deletion of DocLnks in opie-eye
12 12
13 Internal 13 Internal
14 -------- 14 --------
15 * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
15 16
16 2005-02-03Opie 1.1.9 17 2005-02-03Opie 1.1.9
17 18
18 New Features 19 New Features
19 ------------ 20 ------------
20 * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) 21 * 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
149 149
150 d->m_font_size_list = new QComboBox( this, "SizeListBox" ); 150 d->m_font_size_list = new QComboBox( this, "SizeListBox" );
151 connect( d->m_font_size_list, SIGNAL( activated(int) ), 151 connect( d->m_font_size_list, SIGNAL( activated(int) ),
152 this, SLOT( fontSizeClicked(int) ) ); 152 this, SLOT( fontSizeClicked(int) ) );
153 gridLayout->addWidget( d->m_font_size_list, 3, 1 ); 153 gridLayout->addWidget( d->m_font_size_list, 3, 1 );
154 154
155 d->m_pointbug = ( qt_version() <= 233 ); 155 d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2
156 156
157 if ( withpreview ) 157 if ( withpreview )
158 { 158 {
159 d->m_preview = new QMultiLineEdit ( this, "Preview" ); 159 d->m_preview = new QMultiLineEdit ( this, "Preview" );
160 d->m_preview->setAlignment ( AlignCenter ); 160 d->m_preview->setAlignment ( AlignCenter );
161 d->m_preview->setWordWrap ( QMultiLineEdit::WidgetWidth ); 161 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 \
45include( big-screen/big-screen.pro ) 45include( big-screen/big-screen.pro )
46include( fileselector/fileselector.pro ) 46include( fileselector/fileselector.pro )
47 47
48INTERFACES = otimepickerbase.ui 48INTERFACES = otimepickerbase.ui
49 49
50TARGET = opieui2 50TARGET = opieui2
51VERSION = 1.9.0 51VERSION = 1.9.1
52 52
53INCLUDEPATH += $(OPIEDIR)/include 53INCLUDEPATH += $(OPIEDIR)/include
54DEPENDPATH += $(OPIEDIR)/include 54DEPENDPATH += $(OPIEDIR)/include
55 55
56LIBS += -lopiecore2 56LIBS += -lopiecore2
57 57