diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-03-19 04:53:12 +1000 |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2011-03-19 04:53:12 +1000 |
| commit | e2f8a10715591518242f0234d51571dd940e8478 (patch) | |
| tree | e05dbd44243ce2f6e036c7bd6f5aed163c590ee8 /src | |
| parent | 07f61af5dbd40c26342c6467a15d13bc76bf1dcd (diff) | |
Linux fixes for new repo.
Now builds on linux, albeit with lots of warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/sceneformats/assimp/ailoaderiostream.cpp | 5 | ||||
| -rw-r--r-- | src/private/qfactoryloader_p.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/sceneformats/assimp/ailoaderiostream.cpp b/src/plugins/sceneformats/assimp/ailoaderiostream.cpp index 0ee44863f..c130592c0 100644 --- a/src/plugins/sceneformats/assimp/ailoaderiostream.cpp +++ b/src/plugins/sceneformats/assimp/ailoaderiostream.cpp @@ -66,8 +66,11 @@ size_t AiLoaderIOStream::Read( void* pvBuffer, size_t pSize, size_t pCount) fprintf(stderr, "AI read error: %s\n", qPrintable(m_device->errorString())); if ((pSize * pCount) != res) // AI will treat as error { + long unsigned int pSizeP = pSize; + long unsigned int pCountP = pCount; + long unsigned int pRes = res; fprintf(stderr, "read mismatch requested size: %lu x count: %lu = %lu != %lu actuall read\n", - pSize, pCount, (pSize * pCount), res); + pSizeP, pCountP, (pSizeP * pCountP), pRes); } return res; } diff --git a/src/private/qfactoryloader_p.h b/src/private/qfactoryloader_p.h index 57432ddd3..17c437222 100644 --- a/src/private/qfactoryloader_p.h +++ b/src/private/qfactoryloader_p.h @@ -63,6 +63,10 @@ QT_BEGIN_NAMESPACE class QFactoryLoaderPrivate; +#ifdef Q_WS_X11 +class QLibraryPrivate; +#endif + class Q_CORE_EXPORT QFactoryLoader : public QObject { Q_OBJECT |