diff options
| author | Qt by Nokia <qt-info@nokia.com> | 2011-04-27 14:13:26 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 14:33:44 +0200 |
| commit | eae8fb85997d82ecec0743ba3e470681129bff41 (patch) | |
| tree | 286a31dce764e209a1e2db556d6c78d400561a2e /mkspecs | |
| parent | 38be0d13830efd2d98281c645c3a60afe05ffece (diff) | |
Initial import from qtquick2.
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 191a449719..e4a5ef7162 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -35,6 +35,9 @@ plugin { #Qt plugins INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt +# As declarative now uses OpenGL in the API, force include it to avoid having to update all projects +contains(QT, declarative): QT += opengl + # As order does matter for static libs, we reorder the QT variable here TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper for(QTLIB, $$list($$TMPLIBS)) { @@ -48,6 +51,7 @@ for(QTLIB, $$list($$QT_UNKNOWN)) { !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB") } + QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { |