Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  don't crash in QProcessEnvironment::systemEnvironment()
  qmake: Introduce new template type
  no environment on WinCE
  fix Widestring vs. Ansi mixup
  fix potential crash in QProcessEnvironment::systemEnvironment() on windows
  Fix compilation with QT_NO_*
  fix build on symbian
  skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
  fix build on mac
  make QProcessEnvironment on Unix cache converted values
  make QProcessEnvironment::systemEnvironment() encoding-safe
  make QProcessEnvironment on Unix cache converted variable names
  move key/value converters to the private class
  make QProcessEnvironment on Windows preserve variable name case
  split QProcessEnvironmentPrivate::Unit into Key and Value
  remove unused functions
  minor optimization: use QList::reserve()
  use the Hash typedef
  Changelog: Qt Designer 4.8

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/designer/src/components/tabordereditor/tabordereditor.cpp b/tools/designer/src/components/tabordereditor/tabordereditor.cpp
index e372bdc..2932adc 100644
--- a/tools/designer/src/components/tabordereditor/tabordereditor.cpp
+++ b/tools/designer/src/components/tabordereditor/tabordereditor.cpp
@@ -208,7 +208,7 @@ bool TabOrderEditor::skipWidget(QWidget *w) const
         if (index != -1) {
             bool ok = false;
             Qt::FocusPolicy q = (Qt::FocusPolicy) Utils::valueOf(sheet->property(index), &ok);
-            return !ok || q == Qt::NoFocus;
+            return !ok || !(q & Qt::TabFocus);
         }
     }