| author | ar <ar> | 2005-01-21 19:56:15 (UTC) |
|---|---|---|
| committer | ar <ar> | 2005-01-21 19:56:15 (UTC) |
| commit | cd51d382be50bc021739395309e23760f1619759 (patch) (unidiff) | |
| tree | e76155f772df7faea5fcf38667c6da8c916208db /core/apps | |
| parent | fdc37fbd908472e28735a8f0b01e3e66a43535e0 (diff) | |
| download | opie-cd51d382be50bc021739395309e23760f1619759.zip opie-cd51d382be50bc021739395309e23760f1619759.tar.gz opie-cd51d382be50bc021739395309e23760f1619759.tar.bz2 | |
- make opie compilable against qte 2.3.10 snapshot
check QT_VERSION against 0x030000 instead of 300
| -rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 2 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index 5171bf1..bee58e7 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
| @@ -253,7 +253,7 @@ void TEWidget::fontChange(const QFont &) | |||
| 253 | //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); | 253 | //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); |
| 254 | //printf("rawname: %s\n",font().rawName().ascii()); | 254 | //printf("rawname: %s\n",font().rawName().ascii()); |
| 255 | fontMap = | 255 | fontMap = |
| 256 | #if QT_VERSION < 300 | 256 | #if QT_VERSION < 0x030000 |
| 257 | strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") | 257 | strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") |
| 258 | ? vt100extended | 258 | ? vt100extended |
| 259 | : | 259 | : |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index cabeb20..c7273c5 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | using namespace Opie::Core; | 45 | using namespace Opie::Core; |
| 46 | using namespace Opie::Ui; | 46 | using namespace Opie::Ui; |
| 47 | 47 | ||
| 48 | #if QT_VERSION < 300 | 48 | #if QT_VERSION < 0x030000 |
| 49 | class QpeEditor : public QMultiLineEdit | 49 | class QpeEditor : public QMultiLineEdit |
| 50 | { | 50 | { |
| 51 | 51 | ||