| author | ar <ar> | 2005-01-21 19:56:15 (UTC) |
|---|---|---|
| committer | ar <ar> | 2005-01-21 19:56:15 (UTC) |
| commit | cd51d382be50bc021739395309e23760f1619759 (patch) (side-by-side diff) | |
| tree | e76155f772df7faea5fcf38667c6da8c916208db /scripts/kconfig | |
| 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-- | scripts/kconfig/qconf.cc | 16 | ||||
| -rw-r--r-- | scripts/kconfig/qconf.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 52419ad..0459caf 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -18,5 +18,5 @@ #include <qfiledialog.h> #include <qregexp.h> -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 #include <qsettings.h> #endif @@ -31,5 +31,5 @@ static QApplication *configApp; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 static QSettings *configSettings; #endif @@ -103,5 +103,5 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu) } -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 /* * set the new data @@ -216,5 +216,5 @@ void ConfigItem::updateMenu(void) data = sym_get_string_value(sym); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 int i = list->mapIdx(dataColIdx); if (i >= 0) @@ -491,5 +491,5 @@ void ConfigList::changeValue(ConfigItem* item) case S_HEX: case S_STRING: -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if (colMap[dataColIdx] >= 0) item->startRename(colMap[dataColIdx]); @@ -752,5 +752,5 @@ ConfigMainWindow::ConfigMainWindow(void) QWidget *d = configApp->desktop(); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64); height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64); @@ -1267,5 +1267,5 @@ int main(int ac, char** av) progname = av[0]; configApp = new QApplication(ac, av); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 configSettings = new QSettings; #endif @@ -1294,5 +1294,5 @@ int main(int ac, char** av) configApp->exec(); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x()); configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y()); diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index c548884..dee5254 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -142,5 +142,5 @@ public: ~ConfigItem(void); void init(void); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 void okRename(int col); #endif |