diff options
author | Boris Barbulovski <bbarbulovski@gmail.com> | 2015-09-22 14:36:01 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2015-10-14 08:59:00 -0400 |
commit | 8328447af88eaab1db29852cb3e4a71cda5bd887 (patch) | |
tree | e3775d767881b623e04f833f878eea6d045dced0 /scripts/kconfig/qconf.cc | |
parent | 1c199f2878f6c1b8c52125ad9805e94fe2dde472 (diff) |
Remove support for QT3 and older.
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts/kconfig/qconf.cc')
-rw-r--r-- | scripts/kconfig/qconf.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index c3bb7fe8dfa6..0e18a9ccf288 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -5,18 +5,6 @@ | |||
5 | 5 | ||
6 | #include <qglobal.h> | 6 | #include <qglobal.h> |
7 | 7 | ||
8 | #if QT_VERSION < 0x040000 | ||
9 | #include <stddef.h> | ||
10 | #include <qmainwindow.h> | ||
11 | #include <qvbox.h> | ||
12 | #include <qvaluelist.h> | ||
13 | #include <qtextbrowser.h> | ||
14 | #include <qaction.h> | ||
15 | #include <qheader.h> | ||
16 | #include <qfiledialog.h> | ||
17 | #include <qdragobject.h> | ||
18 | #include <qpopupmenu.h> | ||
19 | #else | ||
20 | #include <q3mainwindow.h> | 8 | #include <q3mainwindow.h> |
21 | #include <q3vbox.h> | 9 | #include <q3vbox.h> |
22 | #include <q3valuelist.h> | 10 | #include <q3valuelist.h> |
@@ -26,7 +14,6 @@ | |||
26 | #include <q3filedialog.h> | 14 | #include <q3filedialog.h> |
27 | #include <q3dragobject.h> | 15 | #include <q3dragobject.h> |
28 | #include <q3popupmenu.h> | 16 | #include <q3popupmenu.h> |
29 | #endif | ||
30 | 17 | ||
31 | #include <qapplication.h> | 18 | #include <qapplication.h> |
32 | #include <qdesktopwidget.h> | 19 | #include <qdesktopwidget.h> |
@@ -1282,11 +1269,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1282 | QDesktopWidget *d = configApp->desktop(); | 1269 | QDesktopWidget *d = configApp->desktop(); |
1283 | snprintf(title, sizeof(title), "%s%s", | 1270 | snprintf(title, sizeof(title), "%s%s", |
1284 | rootmenu.prompt->text, | 1271 | rootmenu.prompt->text, |
1285 | #if QT_VERSION < 0x040000 | ||
1286 | " (Qt3)" | ||
1287 | #else | ||
1288 | "" | 1272 | "" |
1289 | #endif | ||
1290 | ); | 1273 | ); |
1291 | setCaption(title); | 1274 | setCaption(title); |
1292 | 1275 | ||
@@ -1368,15 +1351,9 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1368 | connect(optGroup, SIGNAL(selected(QAction *)), menuView, | 1351 | connect(optGroup, SIGNAL(selected(QAction *)), menuView, |
1369 | SLOT(setOptionMode(QAction *))); | 1352 | SLOT(setOptionMode(QAction *))); |
1370 | 1353 | ||
1371 | #if QT_VERSION >= 0x040000 | ||
1372 | configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup); | 1354 | configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup); |
1373 | configView->showAllAction = new QAction(_("Show All Options"), optGroup); | 1355 | configView->showAllAction = new QAction(_("Show All Options"), optGroup); |
1374 | configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup); | 1356 | configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup); |
1375 | #else | ||
1376 | configView->showNormalAction = new QAction(_("Show Normal Options"), 0, optGroup); | ||
1377 | configView->showAllAction = new QAction(_("Show All Options"), 0, optGroup); | ||
1378 | configView->showPromptAction = new QAction(_("Show Prompt Options"), 0, optGroup); | ||
1379 | #endif | ||
1380 | configView->showNormalAction->setToggleAction(TRUE); | 1357 | configView->showNormalAction->setToggleAction(TRUE); |
1381 | configView->showNormalAction->setOn(configList->optMode == normalOpt); | 1358 | configView->showNormalAction->setOn(configList->optMode == normalOpt); |
1382 | configView->showAllAction->setToggleAction(TRUE); | 1359 | configView->showAllAction->setToggleAction(TRUE); |