Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:

 - 'make xconfig' ported to Qt5, dropping support for Qt3

 - merge_config.sh supports a single-input-file mode and also respects
   $KCONFIG_CONFIG

 - Fix for incorrect display of >= and > in dependency expressions

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (44 commits)
  Add current selection check.
  Use pkg-config to find Qt 4 and 5 instead of direct qmake
  kconfig: Fix copy&paste error
  kconfig/merge_config.sh: Accept a single file
  kconfig/merge_config.sh: Support KCONFIG_CONFIG
  Update the buildsystem for KConfig finding Qt
  Port xconfig to Qt5 - Update copyright.
  Port xconfig to Qt5 - Fix goParent issue.
  Port xconfig to Qt5 - on Back clicked, deselect old item.
  Port xconfig to Qt5 - Add(back) one click checkbox toggle.
  Port xconfig to Qt5 - Add(back) lineedit editing.
  Port xconfig to Qt5 - Remove some commented code.
  Port xconfig to Qt5 - Source format.
  Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel.
  Port xconfig to Qt5 - Change ConfigItem constructor parent type.
  Port xconfig to Qt5 - Disable ConfigList soring
  Port xconfig to Qt5 - Remove ConfigList::updateMenuList template.
  Port xconfig to Qt5 - Add ConfigList::mode to initializer list.
  Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list.
  Port xconfig to Qt5 - Tree widget set column titles.
  ...

1 files changed, 14 insertions, 42 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3043d6b0b51d..d79cba4ce3eb 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -229,49 +229,21 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 
 # Qt needs some extra effort...
 $(obj)/.tmp_qtcheck:
-        @set -e; $(kecho) "  CHECK   qt"; dir=""; pkg=""; \
-        if ! pkg-config --exists QtCore 2> /dev/null; then \
-            echo "* Unable to find the Qt4 tool qmake. Trying to use Qt3"; \
-            pkg-config --exists qt 2> /dev/null && pkg=qt; \
-            pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
-            if [ -n "$$pkg" ]; then \
-              cflags="\$$(shell pkg-config $$pkg --cflags)"; \
-              libs="\$$(shell pkg-config $$pkg --libs)"; \
-              moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
-              dir="$$(pkg-config $$pkg --variable=prefix)"; \
-            else \
-              for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
-                if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
-              done; \
-              if [ -z "$$dir" ]; then \
-                echo >&2 "*"; \
-                echo >&2 "* Unable to find any Qt installation. Please make sure that"; \
-                echo >&2 "* the Qt4 or Qt3 development package is correctly installed and"; \
-                echo >&2 "* either qmake can be found or install pkg-config or set"; \
-                echo >&2 "* the QTDIR environment variable to the correct location."; \
-                echo >&2 "*"; \
-                false; \
-              fi; \
-              libpath=$$dir/lib; lib=qt; osdir=""; \
-              $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-                osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
-              test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
-              test -f $$libpath/libqt-mt.so && lib=qt-mt; \
-              cflags="-I$$dir/include"; \
-              libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
-              moc="$$dir/bin/moc"; \
-            fi; \
-            if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
-              echo "*"; \
-              echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
-              echo "*"; \
-              moc="/usr/bin/moc"; \
-            fi; \
+        @set -e; $(kecho) "  CHECK   qt"; \
+        if pkg-config --exists Qt5Core; then \
+            cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets`"; \
+            libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \
+            moc=`pkg-config --variable=host_bins Qt5Core`/moc; \
+        elif pkg-config --exists QtCore; then \
+            cflags=`pkg-config --cflags QtCore QtGui`; \
+            libs=`pkg-config --libs QtCore QtGui`; \
+            moc=`pkg-config --variable=moc_location QtCore`; \
         else \
-          cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
-          libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-          moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
-          [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
+            echo >&2 "*"; \
+            echo >&2 "* Could not find Qt via pkg-config."; \
+            echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"; \
+            echo >&2 "*"; \
+            exit 1; \
         fi; \
         echo "KC_QT_CFLAGS=$$cflags" > $@; \
         echo "KC_QT_LIBS=$$libs" >> $@; \