diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 | ||||
| -rw-r--r-- | src/s60installs/qt_libs.pro | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index 324fbe8..f6da51b 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -284,10 +284,12 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef Q_OS_SYMBIAN #ifndef __cplusplus #undef inline #define inline #endif +#endif /* Define to `long' if <sys/types.h> does not define. */ /* #undef off_t */ diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro index a3be711..369a74e 100644 --- a/src/s60installs/qt_libs.pro +++ b/src/s60installs/qt_libs.pro @@ -41,8 +41,11 @@ symbian: { vendorinfo = \ "; Localised Vendor name" \ "%{\"Nokia, Qt Software\"}" \ + " " \ "; Unique Vendor name" \ - ":\"Nokia, Qt Software\"" + ":\"Nokia, Qt Software\"" \ + " " + qtlibraries.pkg_prerules = vendorinfo qtlibraries.pkg_prerules += "; Dependencies of Qt libraries" |