qt-mobility-opensource-src-1.2.0-arm cross compile error solved

root / recipes / qt-mobility / files /force_embedded_withoutx.patch @ e5b46660

历史记录 | 查看 | 追溯 | 下载 (1.3 kB)

15daa384cChristian Sørensen

--- qt-mobility-opensource-src-1.2.0-beta1/plugins/plugins.pro.orig        2011-04-13 10:26:47.136686351 +0200

25daa384cChristian Sørensen

+++ qt-mobility-opensource-src-1.2.0-beta1/plugins/plugins.pro        2011-04-13 10:26:54.768238346 +0200

35daa384cChristian Sørensen

@@ -11,4 +11,4 @@

45daa384cChristian Sørensen

 contains(mobility_modules,location): SUBDIRS += geoservices

55daa384cChristian Sørensen

 contains(mobility_modules,versit): SUBDIRS += versit

65daa384cChristian Sørensen

75daa384cChristian Sørensen

-contains(QT_CONFIG,declarative): SUBDIRS += declarative

85daa384cChristian Sørensen

+SUBDIRS += declarative

95daa384cChristian Sørensen

105daa384cChristian Sørensen

--- qt-mobility-opensource-src-1.2.0-beta1/plugins/multimedia/gstreamer/gstreamer.pro.orig        2011-04-13 10:27:15.342422399 +0200

115daa384cChristian Sørensen

+++ qt-mobility-opensource-src-1.2.0-beta1/plugins/multimedia/gstreamer/gstreamer.pro        2011-04-13 10:27:22.863951996 +0200

125daa384cChristian Sørensen

@@ -78,24 +78,6 @@

135daa384cChristian Sørensen

     qgstreamervideoinputdevicecontrol.cpp \

145daa384cChristian Sørensen

     gstvideoconnector.c

155daa384cChristian Sørensen

165daa384cChristian Sørensen

-

175daa384cChristian Sørensen

-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {

185daa384cChristian Sørensen

-    LIBS += -lXv -lX11 -lXext

195daa384cChristian Sørensen

-

205daa384cChristian Sørensen

-    HEADERS += \

215daa384cChristian Sørensen

-        qgstreamervideooverlay.h \

225daa384cChristian Sørensen

-        qgstreamervideowindow.h \

235daa384cChristian Sørensen

-        qgstreamervideowidget.h \

245daa384cChristian Sørensen

-        qx11videosurface.h \

255daa384cChristian Sørensen

-        qgstxvimagebuffer.h

265daa384cChristian Sørensen

-

275daa384cChristian Sørensen

-    SOURCES += \

285daa384cChristian Sørensen

-        qgstreamervideooverlay.cpp \

295daa384cChristian Sørensen

-        qgstreamervideowindow.cpp \

305daa384cChristian Sørensen

-        qgstreamervideowidget.cpp \

315daa384cChristian Sørensen

-        qx11videosurface.cpp \

325daa384cChristian Sørensen

-        qgstxvimagebuffer.cpp

335daa384cChristian Sørensen

-}

345daa384cChristian Sørensen

 include(mediaplayer/mediaplayer.pri)

355daa384cChristian Sørensen

 include(mediacapture/mediacapture.pri)

365daa384cChristian Sørensen