diff options
| author | Danny Pope <daniel.pope@nokia.com> | 2011-09-12 14:58:14 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 07:40:57 +0200 |
| commit | 69d12fe72edb63f34e07418f5105e95aa9c880d3 (patch) | |
| tree | 8ce3a7474e7423069da66d2fed8672609025aad2 /demos | |
| parent | be034a662e84a9c3d5f360a53b2067af515a1445 (diff) | |
QTBUG fixes for 21303,21239,21241,21300, 21301, 21240
Change-Id: I442601ab160fdd47119628cba3ce93869ab1ec40
Reviewed-on: http://codereview.qt-project.org/4619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qt3d/photobrowser3d/main.cpp | 6 | ||||
| -rw-r--r-- | demos/qt3d/photobrowser3d/photobrowser3d.pro | 11 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/main.cpp | 5 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/robo_bounce.pro | 4 |
4 files changed, 20 insertions, 6 deletions
diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp index 1ad103526..c26a9c542 100644 --- a/demos/qt3d/photobrowser3d/main.cpp +++ b/demos/qt3d/photobrowser3d/main.cpp @@ -41,11 +41,15 @@ #include <QtGui/QApplication> #include <QtCore/QThread> - +#include "qgltexture2d.h" #include "photobrowser3dview.h" int main(int argc, char *argv[]) { +#ifdef Q_OS_SYMBIAN + QGLTexture2D::setMaxImageSize(256,256); +#endif + Q_INIT_RESOURCE(photobrowser3d); QApplication app(argc, argv); diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 5fc210277..547f659a1 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -56,11 +56,12 @@ OTHER_FILES += \ shaders/replace_texture.vsh symbian { - symbian-abld|symbian-sbsv2 { - # ro-section in photobrowser3d can exceed default allocated space, so move rw-section a little further - QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 - QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 - } +# symbian-abld|symbian-sbsv2 { +# # ro-section in photobrowser3d can exceed default allocated space, so move rw-section a little further +# QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 +# QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 +# } + TARGET.EPOCHEAPSIZE = 0x80000 0x8000000 } OTHER_FILES += \ diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp index c635e86a3..07f7f2199 100644 --- a/demos/quick3d/robo_bounce/main.cpp +++ b/demos/quick3d/robo_bounce/main.cpp @@ -40,10 +40,15 @@ ****************************************************************************/ #include <QtGui/QApplication> +#include "qgltexture2d.h" #include "qdeclarativeview3d.h" int main(int argc, char *argv[]) { +#ifdef Q_OS_SYMBIAN + QGLTexture2D::setMaxImageSize(256,256); +#endif + QApplication app(argc, argv); QDeclarativeView3D view; diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro index 671f2a93a..6730f4e5e 100644 --- a/demos/quick3d/robo_bounce/robo_bounce.pro +++ b/demos/quick3d/robo_bounce/robo_bounce.pro @@ -15,3 +15,7 @@ RC_FILE = robo_bounce.rc RESOURCES += \ robo_bounce.qrc + +symbian { + TARGET.EPOCHEAPSIZE = 0x40000 0x4000000 +} |