diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 17:37:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 17:37:45 (GMT) |
| commit | 4f2338d460c5511fa3c31b4e6e438703736006d8 (patch) | |
| tree | 463b75933b75c5eb32955edbd6153fdf603de01e /src/plugins | |
| parent | 265074001db00920abbb0defba69743ef71c4cc0 (diff) | |
| parent | 30dbb938701963c92fc911f59c72720741e556d1 (diff) | |
| download | Qt-4f2338d460c5511fa3c31b4e6e438703736006d8.zip Qt-4f2338d460c5511fa3c31b4e6e438703736006d8.tar.gz Qt-4f2338d460c5511fa3c31b4e6e438703736006d8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement tiled image and pixmap drawing in VG paint engine.
Changed maximum heap size for qmlflickr on Symbian.
Change Symbian to use destroyed swap behaviour in GL
Remove useless profile reference.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/audio/audio.pro | 3 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/audio/audio.pro b/src/plugins/audio/audio.pro deleted file mode 100644 index b7a775b..0000000 --- a/src/plugins/audio/audio.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = - diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index afa0901..e778ab7 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,5 +13,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon -contains(QT_CONFIG, multimedia): SUBDIRS *= audio contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling |