diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-18 02:59:09 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-18 02:59:09 (GMT) |
| commit | 6d0211d01269273392c0ce9997987e5d68e4d114 (patch) | |
| tree | 447bfc2200d2edf4f0a299e7e004070fee62a2db | |
| parent | 62615291477b6268263fad5c1f767d6291b541c4 (diff) | |
| download | Qt-6d0211d01269273392c0ce9997987e5d68e4d114.zip Qt-6d0211d01269273392c0ce9997987e5d68e4d114.tar.gz Qt-6d0211d01269273392c0ce9997987e5d68e4d114.tar.bz2 | |
Fix Windows compile.
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/qml/qmlsqldatabase.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index a00b175..c6edbe2 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -84,6 +84,12 @@ #include <private/qmlxmlhttprequest_p.h> #include <private/qmlsqldatabase_p.h> +#ifdef Q_OS_WIN // for %APPDATA% +#include "qt_windows.h" +#include "qlibrary.h" +#define CSIDL_APPDATA 0x001a // <username>\Application Data +#endif + Q_DECLARE_METATYPE(QmlMetaProperty) Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index fda0342..5869a56 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -59,12 +59,6 @@ #include <QtCore/qdir.h> #include <QtCore/qdebug.h> -#ifdef Q_OS_WIN // for %APPDATA% -#include "qt_windows.h" -#include "qlibrary.h" -#define CSIDL_APPDATA 0x001a // <username>\Application Data -#endif - Q_DECLARE_METATYPE(QSqlDatabase) Q_DECLARE_METATYPE(QSqlQuery) |