diff options
author | Boris Barbulovski <bbarbulovski@gmail.com> | 2015-09-22 11:36:06 -0700 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2015-10-14 14:59:01 +0200 |
commit | 924bbb53d512688bf9caae10a0d2d8b081aea535 (patch) | |
tree | 3089722d19fb93d19aee44de3b15a0bc5f52543e /scripts/kconfig/qconf.cc | |
parent | 041fbdc21fadb7747482bddc22a27a431b678c1c (diff) | |
download | linux-924bbb53d512688bf9caae10a0d2d8b081aea535.tar.bz2 |
Port xconfig to Qt5 - Use QTextBrowser
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index bd62f6039626..f4231d406a66 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -8,7 +8,7 @@ #include <QMainWindow> #include <q3vbox.h> #include <QList> -#include <q3textbrowser.h> +#include <qtextbrowser.h> #include <QAction> #include <q3header.h> #include <QFileDialog> @@ -1154,22 +1154,22 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char *text += str2; } -Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos) +QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos) { - Q3PopupMenu* popup = Parent::createPopupMenu(pos); + QMenu* popup = Parent::createStandardContextMenu(pos); QAction* action = new QAction(_("Show Debug Info"), popup); action->setToggleAction(TRUE); connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); action->setOn(showDebug()); - popup->insertSeparator(); + popup->addSeparator(); action->addTo(popup); return popup; } -void ConfigInfoView::contentsContextMenuEvent(QContextMenuEvent *e) +void ConfigInfoView::contextMenuEvent(QContextMenuEvent *e) { - Parent::contentsContextMenuEvent(e); + Parent::contextMenuEvent(e); } ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *name) |