QSettings: use the common appdata dir when bootstrapping qmake on win

QSystemLibrary doesn't depend on QObject, so nothing could stop us

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

(cherry picked from commit 4aff9e52efc7c6fc6124972efb3b381f85c45e4f)

Change-Id: I5209e6424adb5aea00baf1be6f81b286abf32906
Reviewed-on: http://codereview.qt-project.org/4588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

src/corelib/io/qsettings.cpp

@@ -66,13 +66,12 @@
 
 #ifndef QT_NO_QOBJECT
 #include "qcoreapplication.h"
+#endif
 
 #ifdef Q_OS_WIN // for homedirpath reading from registry
 #include "qt_windows.h"
 #include <private/qsystemlibrary_p.h>
-
-#endif // Q_OS_WIN
-#endif // QT_NO_QOBJECT
+#endif
 
 #ifdef Q_OS_VXWORKS
 #  include <ioLib.h>
@@ -1024,9 +1023,6 @@ static QString windowsConfigPath(int type)
 {
     QString result;
 
-#ifndef QT_NO_QOBJECT
-    // We can't use QLibrary if there is QT_NO_QOBJECT is defined
-    // This only happens when bootstrapping qmake.
 #ifndef Q_OS_WINCE
     QSystemLibrary library(QLatin1String("shell32"));
 #else
@@ -1040,8 +1036,6 @@ static QString windowsConfigPath(int type)
         result = QString::fromWCharArray(path);
     }
 
-#endif // QT_NO_QOBJECT
-
     if (result.isEmpty()) {
         switch (type) {
 #ifndef Q_OS_WINCE