Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	tools/qdoc3/cppcodemarker.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/configure b/configure
index 0021697..ac2eabb 100755
--- a/configure
+++ b/configure
@@ -2853,6 +2853,11 @@ if [ "$QT_CROSS_COMPILE" = "yes" ]; then
             echo >&2 ""
         fi
     else
+        echo >&2 ""
+        echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling."
+        echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for"
+        echo >&2 "dependencies"
+        echo >&2 ""
         PKG_CONFIG=""
     fi
 fi