~josephjamesmills/ubuntuchristianedition/0.1

« back to all changes in this revision

Viewing changes to shell/CMakeLists.txt

Committer: Ugo Riboni
Date: 2011-11-25 16:56:32 UTC
mfrom: (771.3.70 unity-2d-tv)
mto: (818.2.1 santon)
mto: This revision was merged to the branch mainline in revision 819.
Revision ID: ugo.riboni@canonical.com-20111125165632-9gwboejah5hhboyl

Merge changes from the upstream shell working branch

files removed:
shell/qml

files renamed:
shell/qml/Shell.qml => shell/Shell.qml

shell/qml/dash/ => shell/dash/

shell/artwork/dash/ => shell/dash/artwork/

shell/qml/launcher/ => shell/launcher/

shell/artwork/launcher/ => shell/launcher/artwork/

shell/qml/player/ => shell/player/

shell/qml/utils.js => shell/utils.js

files modified:
debian/unity-2d-shell.install.in

shell/CMakeLists.txt

shell/app/shell.cpp

shell/app/shelldeclarativeview.cpp

shell/dash/ButtonBackground.qml

shell/dash/Dash.qml

shell/dash/FoldingArrow.qml

shell/dash/Home.qml

shell/dash/HomeShortcuts.qml

shell/dash/LensBar.qml

shell/dash/LensButton.qml

shell/dash/MultiRangeSelectionBar.qml

shell/dash/RatingStars.qml

shell/dash/Scrollbar.qml

shell/dash/SearchEntry.qml

shell/dash/Star.qml

shell/launcher/Launcher.qml

shell/launcher/LauncherItem.qml

shell/launcher/LauncherList.qml

shell/player/Player.qml

Show diffs side-by-side

added added

removed removed

shell/CMakeLists.txt

# Source

add_subdirectory(app)

file(GLOB shell_QML *.qml *.js)

# Install

install(DIRECTORY qml

DESTINATION ${UNITY_2D_DIR}/shell

)

install(DIRECTORY artwork

install(FILES ${shell_QML}

DESTINATION ${UNITY_2D_DIR}/shell

)

install(DIRECTORY launcher

DESTINATION ${UNITY_2D_DIR}/shell

)

install(DIRECTORY dash

DESTINATION ${UNITY_2D_DIR}/shell

)

install(DIRECTORY player

DESTINATION ${UNITY_2D_DIR}/shell

)

Older »