author | mickeyl <mickeyl> | 2005-02-07 15:00:36 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-07 15:00:36 (UTC) |
commit | 0bc169b13ad563819b6483beef775be26016832b (patch) (unidiff) | |
tree | 004ef63126b46ce1b9a18bf5403fe9ce9c256465 /libopie2 | |
parent | 896d2e77ebafd09ee58d6148e31365f47a3668b4 (diff) | |
download | opie-0bc169b13ad563819b6483beef775be26016832b.zip opie-0bc169b13ad563819b6483beef775be26016832b.tar.gz opie-0bc169b13ad563819b6483beef775be26016832b.tar.bz2 |
work around qt_version() bug in Qt/Embedded 2.3.10
-rw-r--r-- | libopie2/opieui/ofontselector.cpp | 2 | ||||
-rw-r--r-- | libopie2/opieui/opieui.pro | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
@@ -131,49 +131,49 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam | |||
131 | d = new OFontSelectorPrivate(); | 131 | d = new OFontSelectorPrivate(); |
132 | 132 | ||
133 | QGridLayout *gridLayout = new QGridLayout( this, 0, 0, 4, 4 ); | 133 | QGridLayout *gridLayout = new QGridLayout( this, 0, 0, 4, 4 ); |
134 | gridLayout->setRowStretch( 4, 10 ); | 134 | gridLayout->setRowStretch( 4, 10 ); |
135 | 135 | ||
136 | d->m_font_family_list = new QListBox( this, "FontListBox" ); | 136 | d->m_font_family_list = new QListBox( this, "FontListBox" ); |
137 | gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 ); | 137 | gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 ); |
138 | connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) ); | 138 | connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) ); |
139 | 139 | ||
140 | QLabel *label = new QLabel( tr( "Style" ), this ); | 140 | QLabel *label = new QLabel( tr( "Style" ), this ); |
141 | gridLayout->addWidget( label, 0, 1 ); | 141 | gridLayout->addWidget( label, 0, 1 ); |
142 | 142 | ||
143 | d->m_font_style_list = new QComboBox( this, "StyleListBox" ); | 143 | d->m_font_style_list = new QComboBox( this, "StyleListBox" ); |
144 | connect( d->m_font_style_list, SIGNAL( activated(int) ), this, SLOT( fontStyleClicked(int) ) ); | 144 | connect( d->m_font_style_list, SIGNAL( activated(int) ), this, SLOT( fontStyleClicked(int) ) ); |
145 | gridLayout->addWidget( d->m_font_style_list, 1, 1 ); | 145 | gridLayout->addWidget( d->m_font_style_list, 1, 1 ); |
146 | 146 | ||
147 | label = new QLabel( tr( "Size" ), this ); | 147 | label = new QLabel( tr( "Size" ), this ); |
148 | gridLayout->addWidget( label, 2, 1 ); | 148 | gridLayout->addWidget( label, 2, 1 ); |
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 ); |
162 | d->m_preview->setMargin ( 3 ); | 162 | d->m_preview->setMargin ( 3 ); |
163 | d->m_preview->setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); | 163 | d->m_preview->setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); |
164 | gridLayout->addRowSpacing ( 5, 4 ); | 164 | gridLayout->addRowSpacing ( 5, 4 ); |
165 | gridLayout->addMultiCellWidget ( d->m_preview, 6, 6, 0, 1 ); | 165 | gridLayout->addMultiCellWidget ( d->m_preview, 6, 6, 0, 1 ); |
166 | gridLayout->setRowStretch ( 6, 5 ); | 166 | gridLayout->setRowStretch ( 6, 5 ); |
167 | } | 167 | } |
168 | else | 168 | else |
169 | d->m_preview = 0; | 169 | d->m_preview = 0; |
170 | 170 | ||
171 | loadFonts ( d->m_font_family_list ); | 171 | loadFonts ( d->m_font_family_list ); |
172 | } | 172 | } |
173 | 173 | ||
174 | OFontSelector::~OFontSelector() | 174 | OFontSelector::~OFontSelector() |
175 | { | 175 | { |
176 | delete d; | 176 | delete d; |
177 | } | 177 | } |
178 | 178 | ||
179 | /** | 179 | /** |
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 | |||
@@ -27,39 +27,39 @@ SOURCES = oclickablelabel.cpp \ | |||
27 | ofontselector.cpp \ | 27 | ofontselector.cpp \ |
28 | oimageeffect.cpp \ | 28 | oimageeffect.cpp \ |
29 | okeyconfigwidget.cpp \ | 29 | okeyconfigwidget.cpp \ |
30 | oledbox.cpp \ | 30 | oledbox.cpp \ |
31 | olistview.cpp \ | 31 | olistview.cpp \ |
32 | opixmapeffect.cpp \ | 32 | opixmapeffect.cpp \ |
33 | opopupmenu.cpp \ | 33 | opopupmenu.cpp \ |
34 | opixmapprovider.cpp \ | 34 | opixmapprovider.cpp \ |
35 | oselector.cpp \ | 35 | oselector.cpp \ |
36 | oseparator.cpp \ | 36 | oseparator.cpp \ |
37 | otabbar.cpp \ | 37 | otabbar.cpp \ |
38 | otabwidget.cpp \ | 38 | otabwidget.cpp \ |
39 | otaskbarapplet.cpp \ | 39 | otaskbarapplet.cpp \ |
40 | otimepicker.cpp \ | 40 | otimepicker.cpp \ |
41 | oversatileview.cpp \ | 41 | oversatileview.cpp \ |
42 | oversatileviewitem.cpp \ | 42 | oversatileviewitem.cpp \ |
43 | owait.cpp | 43 | owait.cpp |
44 | 44 | ||
45 | include( big-screen/big-screen.pro ) | 45 | include( big-screen/big-screen.pro ) |
46 | include( fileselector/fileselector.pro ) | 46 | include( fileselector/fileselector.pro ) |
47 | 47 | ||
48 | INTERFACES = otimepickerbase.ui | 48 | INTERFACES = otimepickerbase.ui |
49 | 49 | ||
50 | TARGET = opieui2 | 50 | TARGET = opieui2 |
51 | VERSION = 1.9.0 | 51 | VERSION = 1.9.1 |
52 | 52 | ||
53 | INCLUDEPATH += $(OPIEDIR)/include | 53 | INCLUDEPATH += $(OPIEDIR)/include |
54 | DEPENDPATH += $(OPIEDIR)/include | 54 | DEPENDPATH += $(OPIEDIR)/include |
55 | 55 | ||
56 | LIBS += -lopiecore2 | 56 | LIBS += -lopiecore2 |
57 | 57 | ||
58 | !contains( platform, x11 ) { | 58 | !contains( platform, x11 ) { |
59 | include( $(OPIEDIR)/include.pro ) | 59 | include( $(OPIEDIR)/include.pro ) |
60 | } | 60 | } |
61 | 61 | ||
62 | contains( platform, x11 ) { | 62 | contains( platform, x11 ) { |
63 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 63 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
64 | } | 64 | } |
65 | 65 | ||