Fix building of examples.
- Correct install paths - Add missing resources - Add declarative-radio - Remove deploy/install logic from qmlapplicationviewer.pri and snippet .pro-files of the video examples and add normal install rules. Task-number: QTBUG-27977 Change-Id: Iadecb14d9330c752f6fb739918da743a854ba236 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Friedemann Kleint
committed by
The Qt Project
The Qt Project
parent
5ef6db169e
commit
d34f03c609
@@ -1,128 +1,7 @@
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $OTHER_FILES *.pro *.pri
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/$${TARGET}
|
||||
INSTALLS += sources
|
||||
|
||||
QT += quick
|
||||
|
||||
SOURCES += $$PWD/qmlapplicationviewer.cpp
|
||||
HEADERS += $$PWD/qmlapplicationviewer.h
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
defineTest(qtcAddDeployment) {
|
||||
for(deploymentfolder, DEPLOYMENTFOLDERS) {
|
||||
item = item$${deploymentfolder}
|
||||
itemsources = $${item}.sources
|
||||
$$itemsources = $$eval($${deploymentfolder}.source)
|
||||
itempath = $${item}.path
|
||||
$$itempath= $$eval($${deploymentfolder}.target)
|
||||
export($$itemsources)
|
||||
export($$itempath)
|
||||
DEPLOYMENT += $$item
|
||||
}
|
||||
|
||||
MAINPROFILEPWD = $$PWD
|
||||
|
||||
win32 {
|
||||
copyCommand =
|
||||
for(deploymentfolder, DEPLOYMENTFOLDERS) {
|
||||
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
|
||||
source = $$replace(source, /, \\)
|
||||
sourcePathSegments = $$split(source, \\)
|
||||
target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
|
||||
target = $$replace(target, /$, )
|
||||
target = $$target/$$last(sourcePathSegments)
|
||||
target = $$replace(target, /, \\)
|
||||
!isEqual(source,$$target) {
|
||||
!isEmpty(copyCommand):copyCommand += &&
|
||||
isEqual(QMAKE_DIR_SEP, \\) {
|
||||
copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
|
||||
} else {
|
||||
source = $$replace(source, \\\\, /)
|
||||
target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
|
||||
target = $$replace(target, \\\\, /)
|
||||
copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
|
||||
}
|
||||
}
|
||||
}
|
||||
!isEmpty(copyCommand) {
|
||||
copyCommand = @echo Copying application data... && $$copyCommand
|
||||
copydeploymentfolders.commands = $$copyCommand
|
||||
first.depends = $(first) copydeploymentfolders
|
||||
export(first.depends)
|
||||
export(copydeploymentfolders.commands)
|
||||
QMAKE_EXTRA_TARGETS += first copydeploymentfolders
|
||||
}
|
||||
} else:unix {
|
||||
maemo5 {
|
||||
desktopfile.files = $${TARGET}.desktop
|
||||
desktopfile.path = /usr/share/applications/hildon
|
||||
icon.files = $${TARGET}64.png
|
||||
icon.path = /usr/share/icons/hicolor/64x64/apps
|
||||
} else:!isEmpty(MEEGO_VERSION_MAJOR) {
|
||||
desktopfile.path = /usr/share/applications
|
||||
icon.files = $${TARGET}80.png
|
||||
icon.path = /usr/share/icons/hicolor/80x80/apps
|
||||
} else { # Assumed to be a Desktop Unix
|
||||
copyCommand =
|
||||
for(deploymentfolder, DEPLOYMENTFOLDERS) {
|
||||
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
|
||||
source = $$replace(source, \\\\, /)
|
||||
macx {
|
||||
target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
|
||||
} else {
|
||||
target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
|
||||
}
|
||||
target = $$replace(target, \\\\, /)
|
||||
target = $$replace(target, /$, )
|
||||
sourcePathSegments = $$split(source, /)
|
||||
targetFullPath = $$target/$$last(sourcePathSegments)
|
||||
!isEqual(source,$$targetFullPath) {
|
||||
!isEmpty(copyCommand):copyCommand += &&
|
||||
copyCommand += $(MKDIR) \"$$target\"
|
||||
copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
|
||||
}
|
||||
}
|
||||
!isEmpty(copyCommand) {
|
||||
copyCommand = @echo Copying application data... && $$copyCommand
|
||||
copydeploymentfolders.commands = $$copyCommand
|
||||
first.depends = $(first) copydeploymentfolders
|
||||
export(first.depends)
|
||||
export(copydeploymentfolders.commands)
|
||||
QMAKE_EXTRA_TARGETS += first copydeploymentfolders
|
||||
}
|
||||
}
|
||||
installPrefix = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/$${TARGET}
|
||||
!isEmpty(MEEGO_VERSION_MAJOR): installPrefix = /opt/$${TARGET}
|
||||
for(deploymentfolder, DEPLOYMENTFOLDERS) {
|
||||
item = item$${deploymentfolder}
|
||||
itemfiles = $${item}.files
|
||||
$$itemfiles = $$eval($${deploymentfolder}.source)
|
||||
itempath = $${item}.path
|
||||
$$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
|
||||
export($$itemfiles)
|
||||
export($$itempath)
|
||||
INSTALLS += $$item
|
||||
}
|
||||
|
||||
!isEmpty(desktopfile.path) {
|
||||
export(icon.files)
|
||||
export(icon.path)
|
||||
export(desktopfile.files)
|
||||
export(desktopfile.path)
|
||||
INSTALLS += icon desktopfile
|
||||
}
|
||||
|
||||
target.path = $${installPrefix}
|
||||
export(target.path)
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
export (ICON)
|
||||
export (INSTALLS)
|
||||
export (DEPLOYMENT)
|
||||
export (TARGET.EPOCHEAPSIZE)
|
||||
export (TARGET.CAPABILITY)
|
||||
export (LIBS)
|
||||
export (QMAKE_EXTRA_TARGETS)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,27 +1,16 @@
|
||||
TEMPLATE = app
|
||||
TARGET = qmlvideofx
|
||||
|
||||
SOURCES += filereader.cpp \
|
||||
main.cpp
|
||||
HEADERS += filereader.h \
|
||||
trace.h
|
||||
LOCAL_SOURCES = filereader.cpp main.cpp
|
||||
LOCAL_HEADERS = filereader.h trace.h
|
||||
|
||||
SOURCES += $$LOCAL_SOURCES
|
||||
HEADERS += $$LOCAL_HEADERS
|
||||
|
||||
RESOURCES += qmlvideofx.qrc
|
||||
|
||||
qml_folder.source = qml/qmlvideofx
|
||||
qml_folder.target = qml
|
||||
DEPLOYMENTFOLDERS += qml_folder
|
||||
|
||||
images_folder.source = images
|
||||
images_folder.target =
|
||||
DEPLOYMENTFOLDERS += images_folder
|
||||
|
||||
shaders_folder.source = shaders
|
||||
shaders_folder.target =
|
||||
DEPLOYMENTFOLDERS += shaders_folder
|
||||
|
||||
SNIPPETS_PATH = ../snippets
|
||||
include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
|
||||
performanceItemAddDeployment()
|
||||
|
||||
maemo6: {
|
||||
DEFINES += SMALL_SCREEN_LAYOUT
|
||||
@@ -29,4 +18,9 @@ maemo6: {
|
||||
}
|
||||
|
||||
include(qmlapplicationviewer/qmlapplicationviewer.pri)
|
||||
qtcAddDeployment()
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
|
||||
sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideofx.png shaders qml qmlvideofx.svg
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
|
||||
INSTALLS += target sources
|
||||
|
||||
Reference in New Issue
Block a user