diff options
| -rw-r--r-- | demos/demobase.pri | 4 | ||||
| -rw-r--r-- | examples/examplebase.pri | 4 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 | ||||
| -rw-r--r-- | src/s60installs/qt_libs.pro | 5 |
5 files changed, 14 insertions, 4 deletions
diff --git a/demos/demobase.pri b/demos/demobase.pri index f010327..724f64b 100644 --- a/demos/demobase.pri +++ b/demos/demobase.pri @@ -4,7 +4,9 @@ symbian { vendorinfo = \
"; Localised Vendor name" \
"%{\"Nokia, Qt Software\"}" \
+ " " \
"; Unique Vendor name" \
- ":\"Nokia, Qt Software\""
+ ":\"Nokia, Qt Software\"" \
+ " "
default_deployment.pkg_prerules += vendorinfo
}
\ No newline at end of file diff --git a/examples/examplebase.pri b/examples/examplebase.pri index 84dcf92..70e1c37 100644 --- a/examples/examplebase.pri +++ b/examples/examplebase.pri @@ -4,8 +4,10 @@ symbian { vendorinfo = \ "; Localised Vendor name" \ "%{\"Nokia, Qt Software\"}" \ + " " \ "; Unique Vendor name" \ - ":\"Nokia, Qt Software\"" + ":\"Nokia, Qt Software\"" \ + " " default_deployment.pkg_prerules += vendorinfo }
\ No newline at end of file diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index fbadadc..554bf85 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -123,7 +123,8 @@ default_deployment.pkg_prerules = \ "[0x101F7961],0,0,0,{\"S60ProductID\"}" \ "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ - "[0x1028315F],0,0,0,{\"S60ProductID\"}" + "[0x1028315F],0,0,0,{\"S60ProductID\"}" \ + " " DEPLOYMENT += default_deployment 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" |