The patch titled kconfig qconf: fix namespace for Horizontal and Vertical enum values has been added to the -mm tree. Its filename is kconfig-qconf-fix-namespace-for-horizontal-and-vertical-enum-values.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kconfig qconf: fix namespace for Horizontal and Vertical enum values From: Markus Heidelberg <markus.heidelberg@xxxxxx> They were used as QSplitter::Horizontal resp. QSplitter::Vertical, but are defined in the 'Qt' namespace. Fixes the following compiler errors after a quick conversion with 'qt3to4', which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2. scripts/kconfig/qconf.cc: In constructor 'ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow*, const char*)': scripts/kconfig/qconf.cc:1213: error: 'Vertical' is not a member of 'QSplitter' scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()': scripts/kconfig/qconf.cc:1304: error: 'Horizontal' is not a member of 'QSplitter' scripts/kconfig/qconf.cc:1311: error: 'Vertical' is not a member of 'QSplitter' Signed-off-by: Markus Heidelberg <markus.heidelberg@xxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/kconfig/qconf.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN scripts/kconfig/qconf.cc~kconfig-qconf-fix-namespace-for-horizontal-and-vertical-enum-values scripts/kconfig/qconf.cc --- a/scripts/kconfig/qconf.cc~kconfig-qconf-fix-namespace-for-horizontal-and-vertical-enum-values +++ a/scripts/kconfig/qconf.cc @@ -1199,7 +1199,7 @@ ConfigSearchWindow::ConfigSearchWindow(C layout1->addLayout(layout2); split = new QSplitter(this); - split->setOrientation(QSplitter::Vertical); + split->setOrientation(Qt::Vertical); list = new ConfigView(split, name); list->list->mode = listMode; info = new ConfigInfoView(split, name); @@ -1290,14 +1290,14 @@ ConfigMainWindow::ConfigMainWindow(void) move(x, y); split1 = new QSplitter(this); - split1->setOrientation(QSplitter::Horizontal); + split1->setOrientation(Qt::Horizontal); setCentralWidget(split1); menuView = new ConfigView(split1, "menu"); menuList = menuView->list; split2 = new QSplitter(split1); - split2->setOrientation(QSplitter::Vertical); + split2->setOrientation(Qt::Vertical); // create config tree configView = new ConfigView(split2, "config"); _ Patches currently in -mm which might be from markus.heidelberg@xxxxxx are kconfig-fix-typo-mconfig-to-menuconfig-in-a-comment.patch kconfig-add-a-note-about-the-deps-to-the-silentoldconfig-help.patch kconfig-resort-the-documentation-of-the-environment-variables.patch gitignore-ignore-kconfig-i18n-files.patch kconfig-qconf-fix-wall-compiler-warnings.patch kconfig-qconf-fix-namespace-for-horizontal-and-vertical-enum-values.patch kconfig-qconf-add-namespace-for-use-of-key_-enum-values.patch kconfig-qconf-fix-the-type-of-the-desktop-widget.patch kconfig-do-not-hardcode-config-filename.patch kconfig-do-not-hardcode-include-config-autoconf-filename.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html