diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-24 16:18:52 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-24 16:18:52 (GMT) |
| commit | f09b8e7b134c8dfe7e50d64662e943273d721d9a (patch) | |
| tree | 19b13cbe46a5c676327c3b4098e527f465469523 /src/plugins/plugins.pro | |
| parent | 295fbcba490712fe6e6f61926836920366134b55 (diff) | |
| parent | 660f881f04a0880c83a0b43b4f4d0e89da082d92 (diff) | |
| download | Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.zip Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.tar.gz Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 3e7da0e..7479d2f 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,6 +13,5 @@ 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 qpa:SUBDIRS += platforms contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling |