Clean up root project file. Introduce include/ and qml/ and move files around to be where they fit, also adapt everything else to match.
Approved by PS Jenkins bot, Albert Astals Cid.
commitf324b9ce5e49245ee5a1a21c0b8e993136ee92fb
authorMichał Sawicz <michal.sawicz@canonical.com>
dateWed 18 Dec 2013, 18:31 (13 years ago)
parent9d637cd54449b9
325 files changed+183−173
CMakeLists.txt+11−64
@@ -69,17 +69,6 @@ if(SHELL_PLUGINDIR STREQUAL "")
6969 message(FATAL_ERROR "Could not determine plugin import dir.")
7070endif()
7171
72−configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
73−
74−pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
75−
76−include_directories(
77− ${CMAKE_CURRENT_BINARY_DIR}
78− ${CMAKE_CURRENT_SOURCE_DIR}
79− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
80− ${UNITY-MIR_INCLUDE_DIRS}
81− )
82−
8372set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
8473
8574set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
@@ -108,64 +97,22 @@ declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
10897
10998set(SHELL_APP unity8)
11099
111−add_executable(${SHELL_APP}
112− ApplicationArguments.h
113− main.cpp
114− MouseTouchAdaptor.cpp
115− )
116−
117−qt5_use_modules(${SHELL_APP} Qml Quick Test)
118−pkg_check_modules(XCB REQUIRED xcb)
119−
120−if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
121− set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
122−
123− target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
124−endif()
125−
126−
127−# install binaries
128−install(TARGETS ${SHELL_APP}
129− RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
130− )
131−
132−# install top level qml and js files
133−file(GLOB QML_JS_FILES *.qml *.js)
134−
135−install(FILES ${QML_JS_FILES}
136− DESTINATION ${SHELL_APP_DIR}
137− )
100+include_directories(
101+ ${CMAKE_SOURCE_DIR}/include
102+ ${CMAKE_BINARY_DIR}/include
103+)
138104
139105# add subdirectories to build
106+add_subdirectory(include)
107+add_subdirectory(src)
108+add_subdirectory(qml)
140109add_subdirectory(tests)
141110add_subdirectory(plugins)
142−add_subdirectory(src)
143111
144−# install subdirectories
145−set(QML_DIRS
146− Bottombar
147− Components
148− Dash
149− graphics
150− Greeter
151− Hud
152− Panel
153− Launcher
154− SideStage
155− Notifications
156− )
157−
158−install(DIRECTORY ${QML_DIRS}
159− DESTINATION ${SHELL_APP_DIR}
160− )
161−
162−# generate desktop file
163−configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
164−
165−# install desktop file
166−install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
167− DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
168− )
112+#
113+# Data files
114+#
115+add_subdirectory(data)
169116
170117#
171118# Translation
data/CMakeLists.txtnew file+7
@@ -0,0 +1,7 @@
1+# generate desktop file
2+configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
3+
4+# install desktop file
5+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
6+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
7+ )
unity8.desktop.in → data/unity8.desktop.inrenamed
The content is the same.
include/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
paths.h.in → include/paths.h.inrenamed+3−3
@@ -41,11 +41,11 @@ inline QString translationDirectory() {
4141 }
4242}
4343
44−inline QString shellAppDirectory() {
44+inline QString qmlDirectory() {
4545 if (isRunningInstalled()) {
4646 return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
4747 } else {
48− return QString("@CMAKE_SOURCE_DIR@/");
48+ return QString("@CMAKE_SOURCE_DIR@/qml/");
4949 }
5050}
5151
@@ -79,7 +79,7 @@ inline QStringList shellDataDirs() {
7979 }
8080 else {
8181 // append so by default we use xdg files.
82− dirs.append(shellAppDirectory());
82+ dirs.append(qmlDirectory());
8383 }
8484 return dirs;
8585}
plugins/LightDM/CMakeLists.txt+1
@@ -10,6 +10,7 @@ pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
1010include_directories(
1111 ${CMAKE_CURRENT_SOURCE_DIR}
1212 ${CMAKE_CURRENT_BINARY_DIR}
13+ ${CMAKE_SOURCE_DIR}/plugins/Utils
1314 ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
1415 #${LIBLIGHTDM_INCLUDE_DIRS}
1516 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
plugins/LightDM/UsersModel.h+1−1
@@ -23,7 +23,7 @@
2323#ifndef UNITY_USERSMODEL_H
2424#define UNITY_USERSMODEL_H
2525
26−#include "plugins/Utils/qsortfilterproxymodelqml.h"
26+#include <qsortfilterproxymodelqml.h>
2727#include <QtCore/QObject>
2828
2929class UsersModel : public QSortFilterProxyModelQML
plugins/Unity/Indicators/indicatorsmanager.cpp+1−1
@@ -24,7 +24,7 @@
2424#include <upstart.h>
2525#include <nih/alloc.h>
2626
27−#include "paths.h"
27+#include <paths.h>
2828
2929const QString profile = "phone";
3030
plugins/Unity/Indicators/indicatorsmodel.cpp+4−3
@@ -21,7 +21,8 @@
2121#include "indicatorsmanager.h"
2222#include "indicator.h"
2323#include "indicators.h"
24−#include "paths.h"
24+
25+#include <paths.h>
2526
2627#include <QQmlContext>
2728#include <QQmlEngine>
@@ -248,9 +249,9 @@ QVariant IndicatorsModel::data(const QModelIndex &index, int role) const
248249 }
249250 break;
250251 case IndicatorsModelRole::WidgetSource:
251− return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
252+ return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
252253 case IndicatorsModelRole::PageSource:
253− return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
254+ return qmlDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
254255 default:
255256 break;
256257 }
Bottombar/Bottombar.qml → qml/Bottombar/Bottombar.qmlrenamed
The content is the same.
Bottombar/HudButton.qml → qml/Bottombar/HudButton.qmlrenamed
The content is the same.
Bottombar/graphics/hud@20.png → qml/Bottombar/graphics/hud@20.pngrenamed
Binary file not shown.
Bottombar/graphics/hud_invoke_button_active@20.png → qml/Bottombar/graphics/hud_invoke_button_active@20.pngrenamed
Binary file not shown.
qml/CMakeLists.txtnew file+22
@@ -0,0 +1,22 @@
1+file(GLOB QML_JS_FILES *.qml *.js)
2+
3+install(FILES ${QML_JS_FILES}
4+ DESTINATION ${SHELL_APP_DIR}
5+ )
6+
7+set(QML_DIRS
8+ Bottombar
9+ Components
10+ Dash
11+ graphics
12+ Greeter
13+ Hud
14+ Panel
15+ Launcher
16+ SideStage
17+ Notifications
18+ )
19+
20+install(DIRECTORY ${QML_DIRS}
21+ DESTINATION ${SHELL_APP_DIR}
22+ )
Components/AnimationControllerWithSignals.qml → qml/Components/AnimationControllerWithSignals.qmlrenamed
The content is the same.
Components/ApplicationManagerWrapper.qml → qml/Components/ApplicationManagerWrapper.qmlrenamed
The content is the same.
Components/ApplicationScreenshot.qml → qml/Components/ApplicationScreenshot.qmlrenamed
The content is the same.
Components/ApplicationsModelStageFiltered.qml → qml/Components/ApplicationsModelStageFiltered.qmlrenamed
The content is the same.
Components/BaseCarouselDelegate.qml → qml/Components/BaseCarouselDelegate.qmlrenamed
The content is the same.
Components/Carousel.qml → qml/Components/Carousel.qmlrenamed
The content is the same.
Components/Circle.qml → qml/Components/Circle.qmlrenamed
The content is the same.
Components/DragHandle.qml → qml/Components/DragHandle.qmlrenamed
The content is the same.
Components/DraggingArea.qml → qml/Components/DraggingArea.qmlrenamed
The content is the same.
Components/EdgeDemo.qml → qml/Components/EdgeDemo.qmlrenamed
The content is the same.
Components/EdgeDemoOverlay.qml → qml/Components/EdgeDemoOverlay.qmlrenamed
The content is the same.
Components/EdgeDragArea.qml → qml/Components/EdgeDragArea.qmlrenamed
The content is the same.
Components/EdgeDragEvaluator.qml → qml/Components/EdgeDragEvaluator.qmlrenamed
The content is the same.
Components/FilterGrid.qml → qml/Components/FilterGrid.qmlrenamed
The content is the same.
Components/LazyImage.qml → qml/Components/LazyImage.qmlrenamed
The content is the same.
Components/ListItems/Base.qml → qml/Components/ListItems/Base.qmlrenamed
The content is the same.
Components/ListItems/Header.qml → qml/Components/ListItems/Header.qmlrenamed
The content is the same.
Components/ListItems/Highlight.qml → qml/Components/ListItems/Highlight.qmlrenamed
The content is the same.
Components/ListItems/ThinDivider.qml → qml/Components/ListItems/ThinDivider.qmlrenamed
The content is the same.
Components/ListItems/VerticalThinDivider.qml → qml/Components/ListItems/VerticalThinDivider.qmlrenamed
The content is the same.
Components/ListItems/graphics/ListItemDividerHorizontal@18.png → qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.pngrenamed
Binary file not shown.
Components/ListItems/graphics/ListItemDividerVertical@18.png → qml/Components/ListItems/graphics/ListItemDividerVertical@18.pngrenamed
Binary file not shown.
Components/OpenEffect.qml → qml/Components/OpenEffect.qmlrenamed
The content is the same.
Components/PageHeader.qml → qml/Components/PageHeader.qmlrenamed
The content is the same.
Components/PinPadButton.qml → qml/Components/PinPadButton.qmlrenamed
The content is the same.
Components/RatingStars.qml → qml/Components/RatingStars.qmlrenamed
The content is the same.
Components/ResponsiveFlowView.qml → qml/Components/ResponsiveFlowView.qmlrenamed
The content is the same.
Components/ResponsiveGridView.qml → qml/Components/ResponsiveGridView.qmlrenamed
The content is the same.
Components/Revealer.qml → qml/Components/Revealer.qmlrenamed
The content is the same.
Components/SearchHistoryModel.qml → qml/Components/SearchHistoryModel.qmlrenamed
The content is the same.
Components/Showable.qml → qml/Components/Showable.qmlrenamed
The content is the same.
Components/Stage.qml → qml/Components/Stage.qmlrenamed
The content is the same.
Components/StandardAnimation.qml → qml/Components/StandardAnimation.qmlrenamed
The content is the same.
Components/Tile.qml → qml/Components/Tile.qmlrenamed
The content is the same.
Components/TileStyle.qml → qml/Components/TileStyle.qmlrenamed
The content is the same.
Components/UbuntuShapeForItem.qml → qml/Components/UbuntuShapeForItem.qmlrenamed
The content is the same.
Components/VolumeControl.qml → qml/Components/VolumeControl.qmlrenamed
The content is the same.
Components/WrongPasswordAnimation.qml → qml/Components/WrongPasswordAnimation.qmlrenamed
The content is the same.
Components/carousel.js → qml/Components/carousel.jsrenamed
The content is the same.
Components/graphics/PageHeaderBaseDivider@18.png → qml/Components/graphics/PageHeaderBaseDivider@18.pngrenamed
Binary file not shown.
Components/graphics/PageHeaderBaseDivider@18.sci → qml/Components/graphics/PageHeaderBaseDivider@18.scirenamed
The content is the same.
Components/graphics/close@20.png → qml/Components/graphics/close@20.pngrenamed
Binary file not shown.
Components/graphics/icon_star_off@20.png → qml/Components/graphics/icon_star_off@20.pngrenamed
Binary file not shown.
Components/graphics/icon_star_on@20.png → qml/Components/graphics/icon_star_on@20.pngrenamed
Binary file not shown.
Components/graphics/non-selected@18.png → qml/Components/graphics/non-selected@18.pngrenamed
Binary file not shown.
Components/graphics/non-selected@18.sci → qml/Components/graphics/non-selected@18.scirenamed
The content is the same.
Dash/Apps/AppPreview.qml → qml/Dash/Apps/AppPreview.qmlrenamed
The content is the same.
Dash/Apps/CloseIcon.qml → qml/Dash/Apps/CloseIcon.qmlrenamed
The content is the same.
Dash/Apps/DashPluginFilterGrid.qml → qml/Dash/Apps/DashPluginFilterGrid.qmlrenamed
The content is the same.
Dash/Apps/FrequentlyUsedAppsModel.qml → qml/Dash/Apps/FrequentlyUsedAppsModel.qmlrenamed
The content is the same.
Dash/Apps/RunningApplicationTile.qml → qml/Dash/Apps/RunningApplicationTile.qmlrenamed
The content is the same.
Dash/Apps/RunningApplicationsGrid.qml → qml/Dash/Apps/RunningApplicationsGrid.qmlrenamed
The content is the same.
Dash/Apps/graphics/close_btn@9.png → qml/Dash/Apps/graphics/close_btn@9.pngrenamed
Binary file not shown.
Dash/Dash.qml → qml/Dash/Dash.qmlrenamed
The content is the same.
Dash/DashApps.qml → qml/Dash/DashApps.qmlrenamed
The content is the same.
Dash/DashBar.qml → qml/Dash/DashBar.qmlrenamed
The content is the same.
Dash/DashCarousel.qml → qml/Dash/DashCarousel.qmlrenamed
The content is the same.
Dash/DashContent.qml → qml/Dash/DashContent.qmlrenamed
The content is the same.
Dash/DashFilterGrid.qml → qml/Dash/DashFilterGrid.qmlrenamed
The content is the same.
Dash/DashHome.qml → qml/Dash/DashHome.qmlrenamed
The content is the same.
Dash/DashPreview.qml → qml/Dash/DashPreview.qmlrenamed
The content is the same.
Dash/DashPreviewPlaceholder.qml → qml/Dash/DashPreviewPlaceholder.qmlrenamed
The content is the same.
Dash/DashRenderer.qml → qml/Dash/DashRenderer.qmlrenamed
The content is the same.
Dash/Generic/FlatTileStyle.qml → qml/Dash/Generic/FlatTileStyle.qmlrenamed
The content is the same.
Dash/Generic/GenericCarousel.qml → qml/Dash/Generic/GenericCarousel.qmlrenamed
The content is the same.
Dash/Generic/GenericFilterGrid.qml → qml/Dash/Generic/GenericFilterGrid.qmlrenamed
The content is the same.
Dash/Generic/GenericFilterGridPotrait.qml → qml/Dash/Generic/GenericFilterGridPotrait.qmlrenamed
The content is the same.
Dash/Generic/GenericPreview.qml → qml/Dash/Generic/GenericPreview.qmlrenamed
The content is the same.
Dash/Generic/WeatherFilterGrid.qml → qml/Dash/Generic/WeatherFilterGrid.qmlrenamed
The content is the same.
Dash/GenericScopeView.qml → qml/Dash/GenericScopeView.qmlrenamed
The content is the same.
Dash/Movie/MoviePreview.qml → qml/Dash/Movie/MoviePreview.qmlrenamed
The content is the same.
Dash/Music/CarouselDelegateMusic.qml → qml/Dash/Music/CarouselDelegateMusic.qmlrenamed
The content is the same.
Dash/Music/MusicCarousel.qml → qml/Dash/Music/MusicCarousel.qmlrenamed
The content is the same.
Dash/Music/MusicFilterGrid.qml → qml/Dash/Music/MusicFilterGrid.qmlrenamed
The content is the same.
Dash/Music/MusicPreview.qml → qml/Dash/Music/MusicPreview.qmlrenamed
The content is the same.
Dash/Music/MusicTileStyle.qml → qml/Dash/Music/MusicTileStyle.qmlrenamed
The content is the same.
Dash/Music/graphics/music_progress_bg.png → qml/Dash/Music/graphics/music_progress_bg.pngrenamed
Binary file not shown.
Dash/PreviewDelegateMapper.qml → qml/Dash/PreviewDelegateMapper.qmlrenamed
The content is the same.
Dash/Previews/Header.qml → qml/Dash/Previews/Header.qmlrenamed
The content is the same.
Dash/Previews/Reviews.qml → qml/Dash/Previews/Reviews.qmlrenamed
The content is the same.
Dash/ScopeDelegateMapper.qml → qml/Dash/ScopeDelegateMapper.qmlrenamed
The content is the same.
Dash/ScopeListView.qml → qml/Dash/ScopeListView.qmlrenamed
The content is the same.
Dash/SearchableResultModel.qml → qml/Dash/SearchableResultModel.qmlrenamed
The content is the same.
Dash/Video/CarouselDelegateVideo.qml → qml/Dash/Video/CarouselDelegateVideo.qmlrenamed
The content is the same.
Dash/Video/VideoCarousel.qml → qml/Dash/Video/VideoCarousel.qmlrenamed
The content is the same.
Dash/Video/VideoFilterGrid.qml → qml/Dash/Video/VideoFilterGrid.qmlrenamed
The content is the same.
Dash/Video/VideoTileStyle.qml → qml/Dash/Video/VideoTileStyle.qmlrenamed
The content is the same.
Dash/Video/graphics/icon_button_amazon@20.png → qml/Dash/Video/graphics/icon_button_amazon@20.pngrenamed
Binary file not shown.
Dash/Video/graphics/icon_button_u1@20.png → qml/Dash/Video/graphics/icon_button_u1@20.pngrenamed
Binary file not shown.
Dash/Video/graphics/movie_icon_holder@27.png → qml/Dash/Video/graphics/movie_icon_holder@27.pngrenamed
Binary file not shown.
Dash/graphics/header_handlearrow2@20.png → qml/Dash/graphics/header_handlearrow2@20.pngrenamed
Binary file not shown.
Dash/graphics/header_handlearrow@20.png → qml/Dash/graphics/header_handlearrow@20.pngrenamed
Binary file not shown.
Dash/graphics/icon_clear@20.png → qml/Dash/graphics/icon_clear@20.pngrenamed
Binary file not shown.
Dash/graphics/icon_listview_clear@20.png → qml/Dash/graphics/icon_listview_clear@20.pngrenamed
Binary file not shown.
Dash/graphics/icon_search_active@20.png → qml/Dash/graphics/icon_search_active@20.pngrenamed
Binary file not shown.
Dash/graphics/icon_search_inactive@20.png → qml/Dash/graphics/icon_search_inactive@20.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/browser@12.png → qml/Dash/graphics/phone/screenshots/browser@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/camera@12.png → qml/Dash/graphics/phone/screenshots/camera@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/facebook@12.png → qml/Dash/graphics/phone/screenshots/facebook@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/gallery@12.png → qml/Dash/graphics/phone/screenshots/gallery@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/map@12.png → qml/Dash/graphics/phone/screenshots/map@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/music@12.png → qml/Dash/graphics/phone/screenshots/music@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/phone@12.png → qml/Dash/graphics/phone/screenshots/phone@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/settings@12.png → qml/Dash/graphics/phone/screenshots/settings@12.pngrenamed
Binary file not shown.
Dash/graphics/phone/screenshots/twitter@12.png → qml/Dash/graphics/phone/screenshots/twitter@12.pngrenamed
Binary file not shown.
Dash/graphics/play_button@18.png → qml/Dash/graphics/play_button@18.pngrenamed
Binary file not shown.
Dash/graphics/play_button_active@18.png → qml/Dash/graphics/play_button_active@18.pngrenamed
Binary file not shown.
Dash/graphics/play_button_active_big@20.png → qml/Dash/graphics/play_button_active_big@20.pngrenamed
Binary file not shown.
Dash/graphics/play_button_big@20.png → qml/Dash/graphics/play_button_big@20.pngrenamed
Binary file not shown.
Dash/graphics/tablet/icon_close_preview@20.png → qml/Dash/graphics/tablet/icon_close_preview@20.pngrenamed
Binary file not shown.
Dash/graphics/tooltip_arrow@27.png → qml/Dash/graphics/tooltip_arrow@27.pngrenamed
Binary file not shown.
Greeter/Clock.qml → qml/Greeter/Clock.qmlrenamed
The content is the same.
Greeter/Dot.qml → qml/Greeter/Dot.qmlrenamed
The content is the same.
Greeter/Gradient.js → qml/Greeter/Gradient.jsrenamed
The content is the same.
Greeter/Greeter.qml → qml/Greeter/Greeter.qmlrenamed
The content is the same.
Greeter/GreeterContent.qml → qml/Greeter/GreeterContent.qmlrenamed
The content is the same.
Greeter/Infographics.qml → qml/Greeter/Infographics.qmlrenamed
The content is the same.
Greeter/Lockscreen.qml → qml/Greeter/Lockscreen.qmlrenamed
The content is the same.
Greeter/LoginList.qml → qml/Greeter/LoginList.qmlrenamed
The content is the same.
Greeter/ObjectPositioner.qml → qml/Greeter/ObjectPositioner.qmlrenamed
The content is the same.
Greeter/PassphraseLockscreen.qml → qml/Greeter/PassphraseLockscreen.qmlrenamed
The content is the same.
Greeter/PinLockscreen.qml → qml/Greeter/PinLockscreen.qmlrenamed
The content is the same.
Greeter/graphics/dot_empty.png → qml/Greeter/graphics/dot_empty.pngrenamed
Binary file not shown.
Greeter/graphics/dot_filled.png → qml/Greeter/graphics/dot_filled.pngrenamed
Binary file not shown.
Greeter/graphics/dot_pointer.png → qml/Greeter/graphics/dot_pointer.pngrenamed
Binary file not shown.
Greeter/graphics/icon_arrow.png → qml/Greeter/graphics/icon_arrow.pngrenamed
Binary file not shown.
Greeter/graphics/infographic_circle_back.png → qml/Greeter/graphics/infographic_circle_back.pngrenamed
Binary file not shown.
Hud/Hud.qml → qml/Hud/Hud.qmlrenamed
The content is the same.
Hud/HudParametrizedActionsPage.qml → qml/Hud/HudParametrizedActionsPage.qmlrenamed
The content is the same.
Hud/Result.qml → qml/Hud/Result.qmlrenamed
The content is the same.
Hud/ResultList.qml → qml/Hud/ResultList.qmlrenamed
The content is the same.
Hud/SearchBar.qml → qml/Hud/SearchBar.qmlrenamed
The content is the same.
Hud/ShowingAnimation.qml → qml/Hud/ShowingAnimation.qmlrenamed
The content is the same.
Hud/SliderLabel.qml → qml/Hud/SliderLabel.qmlrenamed
The content is the same.
Hud/SoundAmplitudeDelegate.qml → qml/Hud/SoundAmplitudeDelegate.qmlrenamed
The content is the same.
Hud/SoundAmplitudeVisual.qml → qml/Hud/SoundAmplitudeVisual.qmlrenamed
The content is the same.
Hud/ToolBar.qml → qml/Hud/ToolBar.qmlrenamed
The content is the same.
Hud/ToolBarIcon.qml → qml/Hud/ToolBarIcon.qmlrenamed
The content is the same.
Hud/graphics/divider@20.png → qml/Hud/graphics/divider@20.pngrenamed
Binary file not shown.
Hud/graphics/divider@20.sci → qml/Hud/graphics/divider@20.scirenamed
The content is the same.
Hud/graphics/dropshadow_right@20.png → qml/Hud/graphics/dropshadow_right@20.pngrenamed
Binary file not shown.
Hud/graphics/help@20.png → qml/Hud/graphics/help@20.pngrenamed
Binary file not shown.
Hud/graphics/hud_bg@20.png → qml/Hud/graphics/hud_bg@20.pngrenamed
Binary file not shown.
Hud/graphics/hud_handlearrow@20.png → qml/Hud/graphics/hud_handlearrow@20.pngrenamed
Binary file not shown.
Hud/graphics/hud_handlebar@20.png → qml/Hud/graphics/hud_handlebar@20.pngrenamed
Binary file not shown.
Hud/graphics/icon_arrow@20.png → qml/Hud/graphics/icon_arrow@20.pngrenamed
Binary file not shown.
Hud/graphics/icon_clear@20.png → qml/Hud/graphics/icon_clear@20.pngrenamed
Binary file not shown.
Hud/graphics/icon_search@20.png → qml/Hud/graphics/icon_search@20.pngrenamed
Binary file not shown.
Hud/graphics/microphone@20.png → qml/Hud/graphics/microphone@20.pngrenamed
Binary file not shown.
Hud/graphics/popup_triangle@20.png → qml/Hud/graphics/popup_triangle@20.pngrenamed
Binary file not shown.
Hud/graphics/settings@20.png → qml/Hud/graphics/settings@20.pngrenamed
Binary file not shown.
Hud/graphics/undo@20.png → qml/Hud/graphics/undo@20.pngrenamed
Binary file not shown.
Hud/graphics/view-fullscreen@20.png → qml/Hud/graphics/view-fullscreen@20.pngrenamed
Binary file not shown.
Launcher/FoldingLauncherDelegate.qml → qml/Launcher/FoldingLauncherDelegate.qmlrenamed
The content is the same.
Launcher/Launcher.qml → qml/Launcher/Launcher.qmlrenamed
The content is the same.
Launcher/LauncherDelegate.qml → qml/Launcher/LauncherDelegate.qmlrenamed
The content is the same.
Launcher/LauncherPanel.qml → qml/Launcher/LauncherPanel.qmlrenamed
The content is the same.
Launcher/graphics/focused_app_arrow@30.png → qml/Launcher/graphics/focused_app_arrow@30.pngrenamed
Binary file not shown.
Launcher/graphics/highlight@18.png → qml/Launcher/graphics/highlight@18.pngrenamed
Binary file not shown.
Launcher/graphics/home@18.png → qml/Launcher/graphics/home@18.pngrenamed
Binary file not shown.
Launcher/graphics/launcher_bg@30.png → qml/Launcher/graphics/launcher_bg@30.pngrenamed
Binary file not shown.
Launcher/graphics/launcher_bg@30.sci → qml/Launcher/graphics/launcher_bg@30.scirenamed
The content is the same.
Launcher/graphics/non-selected@18.png → qml/Launcher/graphics/non-selected@18.pngrenamed
Binary file not shown.
Launcher/graphics/non-selected@18.sci → qml/Launcher/graphics/non-selected@18.scirenamed
The content is the same.
Launcher/graphics/notification@30.png → qml/Launcher/graphics/notification@30.pngrenamed
Binary file not shown.
Launcher/graphics/notification@30.sci → qml/Launcher/graphics/notification@30.scirenamed
The content is the same.
Launcher/graphics/progressbar-fill@30.png → qml/Launcher/graphics/progressbar-fill@30.pngrenamed
Binary file not shown.
Launcher/graphics/progressbar-fill@30.sci → qml/Launcher/graphics/progressbar-fill@30.scirenamed
The content is the same.
Launcher/graphics/progressbar-trough@30.png → qml/Launcher/graphics/progressbar-trough@30.pngrenamed
Binary file not shown.
Launcher/graphics/progressbar-trough@30.sci → qml/Launcher/graphics/progressbar-trough@30.scirenamed
The content is the same.
Launcher/graphics/quicklist_tooltip@30.png → qml/Launcher/graphics/quicklist_tooltip@30.pngrenamed
Binary file not shown.
Launcher/graphics/selected@18.png → qml/Launcher/graphics/selected@18.pngrenamed
Binary file not shown.
Launcher/graphics/selected@18.sci → qml/Launcher/graphics/selected@18.scirenamed
The content is the same.
Launcher/graphics/triangle@18.png → qml/Launcher/graphics/triangle@18.pngrenamed
Binary file not shown.
Notifications/Notification.qml → qml/Notifications/Notification.qmlrenamed
The content is the same.
Notifications/NotificationMenuItemFactory.qml → qml/Notifications/NotificationMenuItemFactory.qmlrenamed
The content is the same.
Notifications/Notifications.qml → qml/Notifications/Notifications.qmlrenamed
The content is the same.
Notifications/ShapedIcon.qml → qml/Notifications/ShapedIcon.qmlrenamed
The content is the same.
Panel/IndicatorItem.qml → qml/Panel/IndicatorItem.qmlrenamed
The content is the same.
Panel/IndicatorRow.qml → qml/Panel/IndicatorRow.qmlrenamed
The content is the same.
Panel/Indicators.qml → qml/Panel/Indicators.qmlrenamed
The content is the same.
Panel/Indicators/DefaultIndicatorPage.qml → qml/Panel/Indicators/DefaultIndicatorPage.qmlrenamed
The content is the same.
Panel/Indicators/DefaultIndicatorWidget.qml → qml/Panel/Indicators/DefaultIndicatorWidget.qmlrenamed
The content is the same.
Panel/Indicators/client/IndicatorsClient.qml → qml/Panel/Indicators/client/IndicatorsClient.qmlrenamed
The content is the same.
Panel/Indicators/client/IndicatorsList.qml → qml/Panel/Indicators/client/IndicatorsList.qmlrenamed
The content is the same.
Panel/Indicators/client/IndicatorsPage.qml → qml/Panel/Indicators/client/IndicatorsPage.qmlrenamed
The content is the same.
Panel/Indicators/client/IndicatorsTree.qml → qml/Panel/Indicators/client/IndicatorsTree.qmlrenamed
The content is the same.
Panel/MenuContent.qml → qml/Panel/MenuContent.qmlrenamed
The content is the same.
Panel/Panel.qml → qml/Panel/Panel.qmlrenamed
The content is the same.
Panel/PanelBackground.qml → qml/Panel/PanelBackground.qmlrenamed
The content is the same.
Panel/PanelSeparatorLine.qml → qml/Panel/PanelSeparatorLine.qmlrenamed
The content is the same.
Panel/SearchIndicator.qml → qml/Panel/SearchIndicator.qmlrenamed
The content is the same.
Panel/graphics/Battery@18.png → qml/Panel/graphics/Battery@18.pngrenamed
Binary file not shown.
Panel/graphics/Bluetooth@18.png → qml/Panel/graphics/Bluetooth@18.pngrenamed
Binary file not shown.
Panel/graphics/Clock@18.png → qml/Panel/graphics/Clock@18.pngrenamed
Binary file not shown.
Panel/graphics/Location@18.png → qml/Panel/graphics/Location@18.pngrenamed
Binary file not shown.
Panel/graphics/Messages@18.png → qml/Panel/graphics/Messages@18.pngrenamed
Binary file not shown.
Panel/graphics/Network@18.png → qml/Panel/graphics/Network@18.pngrenamed
Binary file not shown.
Panel/graphics/Sound@18.png → qml/Panel/graphics/Sound@18.pngrenamed
Binary file not shown.
Panel/graphics/Sync@18.png → qml/Panel/graphics/Sync@18.pngrenamed
Binary file not shown.
Panel/graphics/System@18.png → qml/Panel/graphics/System@18.pngrenamed
Binary file not shown.
Panel/graphics/Time@18.png → qml/Panel/graphics/Time@18.pngrenamed
Binary file not shown.
Panel/graphics/VerticalDivider@18.png → qml/Panel/graphics/VerticalDivider@18.pngrenamed
Binary file not shown.
Panel/graphics/handle@12.png → qml/Panel/graphics/handle@12.pngrenamed
Binary file not shown.
Panel/graphics/handle@12.sci → qml/Panel/graphics/handle@12.scirenamed
The content is the same.
Panel/graphics/rectangular_dropshadow@30.png → qml/Panel/graphics/rectangular_dropshadow@30.pngrenamed
Binary file not shown.
Panel/graphics/rectangular_dropshadow@30.sci → qml/Panel/graphics/rectangular_dropshadow@30.scirenamed
The content is the same.
Panel/graphics/search@12.png → qml/Panel/graphics/search@12.pngrenamed
Binary file not shown.
Panel/graphics/time_and_date@18.png → qml/Panel/graphics/time_and_date@18.pngrenamed
Binary file not shown.
Shell.qml → qml/Shell.qmlrenamed+1−1
@@ -44,7 +44,7 @@ FocusScope {
4444 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
4545
4646 property real edgeSize: units.gu(2)
47− property url defaultBackground: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
47+ property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
4848 property url background
4949 readonly property real panelHeight: panel.panelHeight
5050
SideStage/SideStage.qml → qml/SideStage/SideStage.qmlrenamed
The content is the same.
SideStage/SidestageHandle.qml → qml/SideStage/SidestageHandle.qmlrenamed
The content is the same.
SideStage/graphics/sidestage_handle@20.png → qml/SideStage/graphics/sidestage_handle@20.pngrenamed
Binary file not shown.
SideStage/graphics/sidestage_handle@20.sci → qml/SideStage/graphics/sidestage_handle@20.scirenamed
The content is the same.
graphics/12_10_background_wide@12.png → qml/graphics/12_10_background_wide@12.pngrenamed
Binary file not shown.
graphics/applicationIcons/browser@18.png → qml/graphics/applicationIcons/browser@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/calendar@18.png → qml/graphics/applicationIcons/calendar@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/camera@18.png → qml/graphics/applicationIcons/camera@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/contacts-app@18.png → qml/graphics/applicationIcons/contacts-app@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/dash@18.png → qml/graphics/applicationIcons/dash@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/evernote@18.png → qml/graphics/applicationIcons/evernote@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/facebook@18.png → qml/graphics/applicationIcons/facebook@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/gallery@18.png → qml/graphics/applicationIcons/gallery@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/gmail@18.png → qml/graphics/applicationIcons/gmail@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/map@18.png → qml/graphics/applicationIcons/map@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/messages-app@18.png → qml/graphics/applicationIcons/messages-app@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/notepad@18.png → qml/graphics/applicationIcons/notepad@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/phone-app@18.png → qml/graphics/applicationIcons/phone-app@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/pinterest@18.png → qml/graphics/applicationIcons/pinterest@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/soundcloud@18.png → qml/graphics/applicationIcons/soundcloud@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/system-settings@18.png → qml/graphics/applicationIcons/system-settings@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/twitter@18.png → qml/graphics/applicationIcons/twitter@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/weather@18.png → qml/graphics/applicationIcons/weather@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/wikipedia@18.png → qml/graphics/applicationIcons/wikipedia@18.pngrenamed
Binary file not shown.
graphics/applicationIcons/youtube@18.png → qml/graphics/applicationIcons/youtube@18.pngrenamed
Binary file not shown.
graphics/avatars/amanda@12.png → qml/graphics/avatars/amanda@12.pngrenamed
Binary file not shown.
graphics/avatars/anna_olsson@12.png → qml/graphics/avatars/anna_olsson@12.pngrenamed
Binary file not shown.
graphics/avatars/funky@12.png → qml/graphics/avatars/funky@12.pngrenamed
Binary file not shown.
graphics/clock@18.png → qml/graphics/clock@18.pngrenamed
Binary file not shown.
graphics/phone_background.jpg → qml/graphics/phone_background.jpgrenamed
Binary file not shown.
graphics/tablet_background.jpg → qml/graphics/tablet_background.jpgrenamed
Binary file not shown.
run+1−1
@@ -3,7 +3,7 @@
33. /etc/environment
44export QML2_IMPORT_PATH
55
6−QML_PHONE_SHELL_PATH=./builddir/unity8
6+QML_PHONE_SHELL_PATH=./builddir/src/unity8
77GDB=false
88FAKE=false
99PINLOCK=false
runtests.sh+1−13
@@ -26,19 +26,7 @@
2626# floating point operations and xml writing is natively supported.
2727
2828
29−if test -e Shell.qml; then
30− echo In-source build detected.
31− SRCDIR=`pwd`
32−elif test -e ../Shell.qml; then
33− echo Out-of-source build detected. Found source dir at ..
34− SRCDIR=`pwd`/..
35−else
36− echo Out-of-source build detected. Source dir not found at ..
37− echo Only in-source builds or out-of-source builds with source dir at .. are supported.
38− exit 1
39−fi
40−
41−cd $SRCDIR
29+SRCDIR=`dirname "$(readlink -f "$0")"`
4230
4331file_list=""
4432
ApplicationArguments.h → src/ApplicationArguments.hrenamed
The content is the same.
src/CMakeLists.txt+27
@@ -1 +1,28 @@
1+pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
2+
3+include_directories(
4+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5+ ${UNITY-MIR_INCLUDE_DIRS}
6+)
7+
8+add_executable(${SHELL_APP}
9+ ApplicationArguments.h
10+ main.cpp
11+ MouseTouchAdaptor.cpp
12+ )
13+
14+qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
15+pkg_check_modules(XCB REQUIRED xcb)
16+
17+if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
18+ set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
19+
20+ target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
21+endif()
22+
23+# install binaries
24+install(TARGETS ${SHELL_APP}
25+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
26+ )
27+
128add_subdirectory(Panel)
MouseTouchAdaptor.cpp → src/MouseTouchAdaptor.cpprenamed
The content is the same.
MouseTouchAdaptor.h → src/MouseTouchAdaptor.hrenamed
The content is the same.
src/Panel/Indicators/client/CMakeLists.txt−4
@@ -14,10 +14,6 @@ add_executable(${INDICATORS_CLIENT_APP}
1414 ${INDICATORS_CLIENT_HEADERS}
1515)
1616
17−include_directories(
18− ${CMAKE_BINARY_DIR}
19−)
20−
2117qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)
2218set_target_properties(${INDICATORS_CLIENT_APP} PROPERTIES COMPILE_FLAGS -fPIC)
2319
src/Panel/Indicators/client/indicatorsclient.cpp+3−2
@@ -19,7 +19,8 @@
1919 */
2020
2121#include "indicatorsclient.h"
22−#include "paths.h"
22+
23+#include <paths.h>
2324
2425#include <QQuickView>
2526#include <QQmlContext>
@@ -36,7 +37,7 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)
3637 QStringList args = m_application->arguments();
3738
3839 m_view = new QQuickView;
39− m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/Indicators/client/"));
40+ m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()+"Panel/Indicators/client/"));
4041 prependImportPaths(m_view->engine(), ::overrideImportPaths());
4142 appendImportPaths(m_view->engine(), ::fallbackImportPaths());
4243
main.cpp → src/main.cpprenamed+3−3
@@ -30,7 +30,7 @@
3030#include <csignal>
3131
3232// local
33−#include "paths.h"
33+#include <paths.h>
3434#include "MouseTouchAdaptor.h"
3535#include "ApplicationArguments.h"
3636
@@ -86,7 +86,7 @@ int startShell(int argc, const char** argv, void* server)
8686 QQuickView* view = new QQuickView();
8787 view->setResizeMode(QQuickView::SizeRootObjectToView);
8888 view->setTitle("Qml Phone Shell");
89− view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()));
89+ view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
9090 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
9191 if (args.contains(QLatin1String("-frameless"))) {
9292 view->setFlags(Qt::FramelessWindowHint);
@@ -109,7 +109,7 @@ int startShell(int argc, const char** argv, void* server)
109109 nativeInterface->setProperty("ubuntuSessionType", 1);
110110 view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
111111
112− QUrl source("Shell.qml");
112+ QUrl source(::qmlDirectory()+"Shell.qml");
113113 prependImportPaths(view->engine(), ::overrideImportPaths());
114114 appendImportPaths(view->engine(), ::fallbackImportPaths());
115115
tests/mocks/LightDM/CMakeLists.txt+1
@@ -13,6 +13,7 @@ add_subdirectory(single-passphrase)
1313include_directories(
1414 ${CMAKE_CURRENT_SOURCE_DIR}
1515 ${CMAKE_CURRENT_BINARY_DIR}
16+ ${CMAKE_SOURCE_DIR}/plugins/Utils
1617 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
1718)
1819
tests/mocks/Unity/Application/ApplicationManager.cpp+4−3
@@ -16,7 +16,8 @@
1616
1717#include "ApplicationManager.h"
1818#include "ApplicationInfo.h"
19−#include "paths.h"
19+
20+#include <paths.h>
2021
2122#include <QDir>
2223#include <QGuiApplication>
@@ -273,7 +274,7 @@ void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
273274 " smooth: true\n"
274275 " fillMode: Image.PreserveAspectCrop\n"
275276 "}").arg(topMargin)
276− .arg(shellAppDirectory())
277+ .arg(qmlDirectory())
277278 .arg(application->icon().toString());
278279 application->setWindowQml(windowQml);
279280
@@ -284,7 +285,7 @@ void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
284285 " source: \"file://%1/Dash/graphics/phone/screenshots/%2.png\"\n"
285286 " smooth: true\n"
286287 " fillMode: Image.PreserveAspectCrop\n"
287− "}").arg(shellAppDirectory())
288+ "}").arg(qmlDirectory())
288289 .arg(application->icon().toString());
289290 application->setImageQml(imageQml);
290291}
tests/mocks/Unity/fake_scope.cpp+2−2
@@ -16,7 +16,7 @@
1616
1717#include "fake_scope.h"
1818#include "fake_preview.h"
19−#include "paths.h"
19+#include <paths.h>
2020
2121#include <dee.h>
2222
@@ -236,7 +236,7 @@ DeeModel* create_results_model(unsigned category_count, unsigned result_count) {
236236
237237 dee_model_append(results_model,
238238 ("uri://result."+std::to_string(i)).c_str(),
239− (shellAppDirectory() + "graphics/applicationIcons/dash.png").toLatin1().data(),
239+ (qmlDirectory() + "graphics/applicationIcons/dash.png").toLatin1().data(),
240240 category,
241241 0,
242242 "application/x-desktop",
tests/mocks/libusermetrics/CMakeLists.txt+4
@@ -8,6 +8,10 @@ add_library(MockUserMetrics SHARED ${mock_SOURCES})
88
99qt5_use_modules(MockUserMetrics Gui)
1010
11+include_directories(
12+ ${CMAKE_SOURCE_DIR}/plugins/Utils
13+)
14+
1115set_target_properties(MockUserMetrics PROPERTIES
1216 OUTPUT_NAME usermetricsoutput
1317 VERSION 1)
tests/mocks/libusermetrics/UserMetrics.cpp+1−1
@@ -17,7 +17,7 @@
1717 */
1818
1919#include "UserMetrics.h"
20−#include "plugins/Utils/qvariantlistmodel.h"
20+#include <qvariantlistmodel.h>
2121
2222#include <QtCore/QDir>
2323#include <QtCore/QString>
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -3,6 +3,7 @@ include(QmlTest)
33include_directories(
44 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
55 ${CMAKE_CURRENT_BINARY_DIR}
6+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
67 )
78
89file(GLOB qmlFiles *.qml)
tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp+2−1
@@ -18,7 +18,8 @@
1818 */
1919
2020#include "indicatorsmanager.h"
21−#include "paths.h"
21+
22+#include <paths.h>
2223
2324#include <QtTest>
2425#include <QDebug>
tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+2−1
@@ -19,7 +19,8 @@
1919
2020#include "indicatorsmodel.h"
2121#include "indicators.h"
22−#include "paths.h"
22+
23+#include <paths.h>
2324
2425#include <QtTest>
2526#include <QDebug>
tests/qmltests/Components/CMakeLists.txt+1
@@ -3,6 +3,7 @@
33include_directories(
44 ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
55 ${CMAKE_CURRENT_BINARY_DIR}
6+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
67 )
78
89set(testCommand
tests/qmltests/Components/RevealingRectangle.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19−import "../../../Components"
19+import "../../../qml/Components"
2020
2121Item {
2222 id: revealingRectangle
tests/qmltests/Components/tst_AnimationControllerWithSignals.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020
2121TestCase {
2222 id: testCase
tests/qmltests/Components/tst_Carousel.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components/carousel.js" as Carousel
19+import "../../../qml/Components/carousel.js" as Carousel
2020
2121TestCase {
2222 id: root
tests/qmltests/Components/tst_DragHandle.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import "../../../Components"
18+import "../../../qml/Components"
1919import "tst_DragHandle"
2020import Ubuntu.Components 0.1
2121import Ubuntu.Gestures 0.1
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import "../../../../Components"
18+import "../../../../qml/Components"
1919import Ubuntu.Components 0.1
2020import Ubuntu.Gestures 0.1
2121
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import "../../../../Components"
18+import "../../../../qml/Components"
1919import Ubuntu.Components 0.1
2020import Ubuntu.Gestures 0.1
2121
tests/qmltests/Components/tst_DraggingArea.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020
2121/*
2222 There will be a green rectangle in the center of the
tests/qmltests/Components/tst_EdgeDemoOverlay.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
20−import "../../../Components"
20+import "../../../qml/Components"
2121
2222Item {
2323 id: root
tests/qmltests/Components/tst_FilterGrid.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020import Ubuntu.Components.ListItems 0.1 as ListItem
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_LazyImage.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020import Ubuntu.Components 0.1
2121import Unity.Test 0.1 as UT
2222import "tst_LazyImage"
tests/qmltests/Components/tst_LazyImage/ImageControls.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19−import "../../../../Components"
19+import "../../../../qml/Components"
2020
2121Row {
2222 property LazyImage image
tests/qmltests/Components/tst_OpenEffect.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020
2121TestCase {
2222 name: "OpenEffectTest"
tests/qmltests/Components/tst_PageHeader.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Components"
20+import "../../../qml/Components"
2121import Ubuntu.Components 0.1
2222import Unity 0.1
2323import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_RatingStars.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Components"
19+import "../../../qml/Components"
2020
2121TestCase {
2222 name: "RatingStars"
tests/qmltests/Components/tst_ResponsiveFlowView.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Components"
20+import "../../../qml/Components"
2121import Ubuntu.Components.ListItems 0.1 as ListItem
2222import Ubuntu.Components 0.1
2323import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_ResponsiveGridView.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Components"
20+import "../../../qml/Components"
2121import Ubuntu.Components.ListItems 0.1 as ListItem
2222import Ubuntu.Components 0.1
2323import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_Showable.qml+1−1
@@ -19,7 +19,7 @@ import QtTest 1.0
1919import Ubuntu.Components 0.1
2020import Unity.Test 0.1 as UT
2121import ".."
22−import "../../../Components"
22+import "../../../qml/Components"
2323
2424/*
2525 There will be 3 stacked rectangles, red, green & blue. Initially they
tests/qmltests/Components/tst_Stage.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Components"
20+import "../../../qml/Components"
2121import Unity.Application 0.1
2222import Ubuntu.Components 0.1
2323import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_Tile.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Components"
20+import "../../../qml/Components"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
2323
tests/qmltests/Dash/Apps/tst_AppPreview.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import Ubuntu.Components 0.1
20−import "../../../../Dash/Apps"
20+import "../../../../qml/Dash/Apps"
2121import Unity.Test 0.1 as UT
2222
2323Item {
tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../../Dash/Apps"
19+import "../../../../qml/Dash/Apps"
2020import Unity.Test 0.1 as UT
2121
2222Item {
tests/qmltests/Dash/Movie/tst_MoviePreview.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../../Dash/Movie"
19+import "../../../../qml/Dash/Movie"
2020import Unity.Test 0.1 as UT
2121
2222Item {
tests/qmltests/Dash/Music/tst_MusicPreview.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../../Dash/Music"
19+import "../../../../qml/Dash/Music"
2020import Unity.Test 0.1 as UT
2121import QtMultimedia 5.0
2222
tests/qmltests/Dash/qml/FakeScopeView.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import Unity 0.1
1919
20−import "../../../../Dash"
20+import "../../../../qml/Dash"
2121
2222GenericScopeView {
2323 id: fakeScopeView
tests/qmltests/Dash/tst_Dash.qml+6−6
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Dash"
19+import "../../../qml/Dash"
2020import Ubuntu.Components 0.1
2121import Unity.Test 0.1 as UT
2222
@@ -36,12 +36,12 @@ Item {
3636 ScopeDelegateMapper {
3737 id: scopeDelegateMapper
3838 scopeDelegateMapping: {
39− "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
40− "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
41− "home.scope": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
42− "applications.scope": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
39+ "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),
40+ "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),
41+ "home.scope": Qt.resolvedUrl("qml/fake_scopeView3.qml"),
42+ "applications.scope": Qt.resolvedUrl("qml/fake_scopeView4.qml")
4343 }
44− genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
44+ genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")
4545 }
4646
4747 UT.UnityTestCase {
tests/qmltests/Dash/tst_DashBar.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity 0.1
2020import ".."
21−import "../../../Dash"
21+import "../../../qml/Dash"
2222import Ubuntu.Components 0.1
2323import Unity.Test 0.1 as UT
2424
tests/qmltests/Dash/tst_DashContent.qml+6−6
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Dash"
19+import "../../../qml/Dash"
2020import Ubuntu.Components 0.1
2121import Unity 0.1
2222import Unity.Test 0.1 as UT
@@ -64,12 +64,12 @@ Item {
6464 ScopeDelegateMapper {
6565 id: scopeDelegateMapper
6666 scopeDelegateMapping: {
67− "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
68− "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
69− "home.scope": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
70− "applications.scope": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
67+ "MockScope1": Qt.resolvedUrl("qml/fake_scopeView1.qml"),
68+ "MockScope2": Qt.resolvedUrl("qml/fake_scopeView2.qml"),
69+ "home.scope": Qt.resolvedUrl("qml/fake_scopeView3.qml"),
70+ "applications.scope": Qt.resolvedUrl("qml/fake_scopeView4.qml")
7171 }
72− genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
72+ genericScope: Qt.resolvedUrl("qml/fake_generic_scopeView.qml")
7373 }
7474
7575 function clear_scope_status() {
tests/qmltests/Dash/tst_DashPreview.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Dash"
20+import "../../../qml/Dash"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
2323
tests/qmltests/Dash/tst_FilterGrids.qml+3−3
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Dash/Video"
19+import "../../../qml/Dash/Video"
2020import Ubuntu.Components.ListItems 0.1 as ListItem
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
@@ -46,7 +46,7 @@ Rectangle {
4646 Button {
4747 anchors {left: parent.left; right: parent.right; margins: units.gu(1) }
4848 text: testCase.test_clicked_signal_data()[index].tag
49− onClicked: gridLoader.source = "../../../Dash/" + testCase.test_clicked_signal_data()[index].component
49+ onClicked: gridLoader.source = "../../../qml/Dash/" + testCase.test_clicked_signal_data()[index].component
5050 }
5151 }
5252 }
@@ -114,7 +114,7 @@ Rectangle {
114114
115115 function test_clicked_signal(data) {
116116 gridLoader.source = "";
117− gridLoader.source = "../../../Dash/" + data.component;
117+ gridLoader.source = "../../../qml/Dash/" + data.component;
118118
119119 // Wait until the FilterGrid is loaded by the loader
120120 tryCompare(gridLoader, "status", Loader.Ready);
tests/qmltests/Dash/tst_GenericPreview.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtTest 1.0
19−import "../../../Dash/Generic"
19+import "../../../qml/Dash/Generic"
2020import Unity.Test 0.1 as UT
2121
2222Item {
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2
@@ -18,8 +18,8 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity 0.1
2020import ".."
21−import "../../../Dash"
22−import "../../../Components"
21+import "../../../qml/Dash"
22+import "../../../qml/Components"
2323import Ubuntu.Components 0.1
2424import Unity.Test 0.1 as UT
2525
tests/qmltests/Greeter/tst_Clock.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Greeter"
20+import "../../../qml/Greeter"
2121import Ubuntu.Components 0.1
2222import QMenuModel 0.1
2323import Unity.Test 0.1 as UT
tests/qmltests/Greeter/tst_Infographics.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Greeter"
20+import "../../../qml/Greeter"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
2323import LightDM 0.1 as LightDM
tests/qmltests/Greeter/tst_Lockscreen.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Greeter"
20+import "../../../qml/Greeter"
2121import Ubuntu.Components 0.1
2222import LightDM 0.1 as LightDM
2323import Unity.Test 0.1 as UT
tests/qmltests/Greeter/tst_Phone.qml+3−3
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Greeter"
20+import "../../../qml/Greeter"
2121import AccountsService 0.1
2222import LightDM 0.1 as LightDM
2323import Ubuntu.Components 0.1
@@ -33,7 +33,7 @@ Item {
3333 height: parent.height
3434 x: 0; y: 0
3535
36− defaultBackground: "../../../graphics/phone_background.jpg"
36+ defaultBackground: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
3737
3838 property int minX: 0
3939
@@ -135,7 +135,7 @@ Item {
135135
136136 function test_background_data() {
137137 return [
138− {tag: "set", accounts: "../tests/data/unity/backgrounds/blue.png", expected: "blue.png"},
138+ {tag: "set", accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"), expected: "blue.png"},
139139 {tag: "unset", accounts: "", expected: "background.jpg"},
140140 {tag: "invalid", accounts: "invalid", expected: "background.jpg"},
141141 ]
tests/qmltests/Greeter/tst_Tablet.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Greeter"
20+import "../../../qml/Greeter"
2121import Ubuntu.Components 0.1
2222import LightDM 0.1 as LightDM
2323import Unity.Test 0.1 as UT
tests/qmltests/Hud/tst_Hud.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Hud"
20+import "../../../qml/Hud"
2121import HudClient 0.1
2222import Unity.Test 0.1 as UT
2323
tests/qmltests/Hud/tst_Result.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Hud"
20+import "../../../qml/Hud"
2121import Unity.Test 0.1 as UT
2222
2323Rectangle {
tests/qmltests/Launcher/tst_Launcher.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../Launcher"
21+import "../../../qml/Launcher"
2222import Unity.Launcher 0.1
2323
2424/* Nothing is shown at first. If you drag from left edge you will bring up the
tests/qmltests/Notifications/tst_Notifications.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Notifications"
20+import "../../../qml/Notifications"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1
2323import Unity.Notifications 1.0
tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import QMenuModel 0.1
21−import "../../../../Panel/Indicators"
21+import "../../../../qml/Panel/Indicators"
2222
2323Item {
2424 id: testView
tests/qmltests/Panel/tst_IndicatorItem.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Panel"
20+import "../../../qml/Panel"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
2323
tests/qmltests/Panel/tst_IndicatorRow.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../Panel"
21+import "../../../qml/Panel"
2222import Unity.Indicators 0.1 as Indicators
2323
2424/*
tests/qmltests/Panel/tst_Indicators.qml+2−2
@@ -18,8 +18,8 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../Panel"
22−import "../../../Components"
21+import "../../../qml/Panel"
22+import "../../../qml/Components"
2323
2424/*
2525 This tests the Indicators component by using a fake model to stage data in the indicators
tests/qmltests/Panel/tst_MenuContent.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../Panel"
21+import "../../../qml/Panel"
2222import Unity.Indicators 0.1 as Indicators
2323
2424Item {
tests/qmltests/Panel/tst_Panel.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../Panel"
21+import "../../../qml/Panel"
2222
2323/*
2424 This tests the Panel component using a fake model to stage data in the indicators
tests/qmltests/Panel/tst_SearchIndicator.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
20−import "../../../Panel"
20+import "../../../qml/Panel"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1 as UT
2323
tests/qmltests/SideStage/tst_SideStage.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
21−import "../../../SideStage"
21+import "../../../qml/SideStage"
2222import Ubuntu.Components 0.1
2323
2424UT.UnityTestCase {
tests/qmltests/tst_Shell.qml+3−3
@@ -24,7 +24,7 @@ import Unity.Application 0.1
2424import Unity.Test 0.1 as UT
2525import Powerd 0.1
2626
27−import "../.."
27+import "../../qml"
2828
2929Item {
3030 width: shell.width
@@ -469,8 +469,8 @@ Item {
469469
470470 function test_background_data() {
471471 return [
472− {tag: "red", url: "tests/data/unity/backgrounds/red.png", expectedUrl: "tests/data/unity/backgrounds/red.png"},
473− {tag: "blue", url: "tests/data/unity/backgrounds/blue.png", expectedUrl: "tests/data/unity/backgrounds/blue.png"},
472+ {tag: "red", url: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), expectedUrl: "tests/data/unity/backgrounds/red.png"},
473+ {tag: "blue", url: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), expectedUrl: "tests/data/unity/backgrounds/blue.png"},
474474 {tag: "invalid", url: "invalid", expectedUrl: shell.defaultBackground},
475475 {tag: "empty", url: "", expectedUrl: shell.defaultBackground}
476476 ]
tests/uqmlscene/CMakeLists.txt+6−1
@@ -1,12 +1,17 @@
11add_executable(uqmlscene
22 ${shellapplication_MOC_SRCS}
33 main.cpp
4− ../../MouseTouchAdaptor.cpp
4+ ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp
55 )
66
77qt5_use_modules(uqmlscene Qml Quick Test)
88pkg_check_modules(XCB REQUIRED xcb)
99
10+include_directories(
11+ ${CMAKE_SOURCE_DIR}/src
12+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13+)
14+
1015if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
1116 set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
1217endif()
tests/uqmlscene/main.cpp+1−1
@@ -63,7 +63,7 @@
6363#include <QtCore/QTranslator>
6464#include <QtCore/QLibraryInfo>
6565
66−#include "../../MouseTouchAdaptor.h"
66+#include <MouseTouchAdaptor.h>
6767
6868#ifdef QML_RUNTIME_TESTING
6969class RenderStatistics
tests/utils/modules/Unity/Test/CMakeLists.txt+4
@@ -1,5 +1,9 @@
11add_definitions(-DQT_NO_KEYWORDS)
22
3+include_directories(
4+ ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5+)
6+
37set(UnityTestQML_SOURCES
48 testutil.cpp
59 plugin.cpp