diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-06-17 10:56:06 +1000 |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2011-06-17 10:56:06 +1000 |
| commit | fe0dbc4fe8b089ce2b7c9e4d2d950ca8daa5097f (patch) | |
| tree | 71713040be32762efba27b1d9502843f17ebf45a /demos | |
| parent | 2c6302456aadb4b887d4329fa1e5ad8d9d674a5e (diff) | |
| parent | 6c66211a60b08c4ccd70ee95bc2aed3e5cf824d8 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3d
Conflicts:
examples/qt3d/builder/builder.pro
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/quick3d/model_viewer/model_viewer.pro | 6 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/robo_bounce.pro | 6 | ||||
| -rw-r--r-- | demos/quick3d/tea_service/tea_service.pro | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro index 12fc553e2..17c2994d9 100644 --- a/demos/quick3d/model_viewer/model_viewer.pro +++ b/demos/quick3d/model_viewer/model_viewer.pro @@ -33,12 +33,6 @@ symbian { } } -# for cleanup on Windows platforms - avoid deletion prompts -win32 { - QMAKE_DEL_FILE = del /q - QMAKE_DEL_DIR = rmdir /s /q -} - # for make install use in packages distInstalls.files = qml distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro index 0db4837b3..07ed447f9 100644 --- a/demos/quick3d/robo_bounce/robo_bounce.pro +++ b/demos/quick3d/robo_bounce/robo_bounce.pro @@ -33,12 +33,6 @@ symbian { } } -# for cleanup on Windows platforms - avoid deletion prompts -win32 { - QMAKE_DEL_FILE = del /q - QMAKE_DEL_DIR = rmdir /s /q -} - # for make install use in packages distInstalls.files = qml distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro index aea0e75e5..9baf03c55 100644 --- a/demos/quick3d/tea_service/tea_service.pro +++ b/demos/quick3d/tea_service/tea_service.pro @@ -33,12 +33,6 @@ symbian { } } -# for cleanup on Windows platforms - avoid deletion prompts -win32 { - QMAKE_DEL_FILE = del /q - QMAKE_DEL_DIR = rmdir /s /q -} - # for make install use in packages distInstalls.files = qml distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET |