diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 07:55:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 07:55:56 (GMT) |
| commit | 06557b8d7c472c6298f7d8b310feda225864265f (patch) | |
| tree | 571e5078ee66377cdadbc07fc7851b334c0d5272 /src/plugins/plugins.pro | |
| parent | 83a2be48a82394ae692d91587c64f8ccd385350f (diff) | |
| parent | fa065de6eb49c706feb4a75db7bc0a4618a81a13 (diff) | |
| download | Qt-06557b8d7c472c6298f7d8b310feda225864265f.zip Qt-06557b8d7c472c6298f7d8b310feda225864265f.tar.gz Qt-06557b8d7c472c6298f7d8b310feda225864265f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (195 commits)
Re-apply licenseheader text in source files for qt4.8
Revert all QScroller and QFlickGesture related code.
Fix regression that caused waitForXXX(-1) to fail.
Fix thread safety regression of QNetworkConfigurationManager
Fix instability in QNetworkConfigurationManager autotest
Support word selection list with predictive text from splitview
Fix softkey icon positioning in S60 5.3
QDeclarativeMouseArea: block context menu events
ListViews loses items if all visible items are removed.
Make TextEdit word selection more natural.
Fixed license header.
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Clear confusion between QMainWindow and QMainWindowLayout.
Fix for rounded corners bug in QMenu
Compile
QWidgetPrivate::setParent_sys might be using null pointer
Ensure the TextEdit cursor delegate is repositioned on mouse events.
Don't crash on an invalid replacementStart from an input method.
Fix QGLWidget::renderPixmap for raster engine on Mac
Check if OES_texture_npot is present on OpenGL ES 2.
...
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 7479d2f..2d0c201 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -7,9 +7,9 @@ unix:!symbian { SUBDIRS *= codecs } !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines -!embedded:!qpa:SUBDIRS *= graphicssystems +!embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods +!win32:!embedded:!mac:!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 contains(QT_CONFIG, phonon): SUBDIRS *= phonon |