Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9478c1d06b4b4c3bedf1947c709028c6435caf5c
This commit is contained in:
Frederik Gladhorn
2013-04-03 14:58:39 +02:00

View File

@@ -9,3 +9,7 @@ JAVACLASSPATH += $$PWD/src
JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \
$$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \ $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \
$$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java
# install
target.path = $$[QT_INSTALL_PREFIX]/jar
INSTALLS += target