3714198 · unity8 · git.iko.soy

git.iko.soy/unity8

Move resources required by the Unity.Application mock inside it

commit37141981eca2d341a3f44650514f575359a12151 authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 30 Apr 2015, 22:46 (11 years ago) parent560941b

9 files changed+15−20

compare with xenial

unifiedsplit

CMakeLists.txt+2−1

@@ -13,8 +13,9 @@ endif()

1313

1414set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

1515

16−# Instruct CMake to run moc automatically when needed.

16+# Instruct CMake to run moc and rcc automatically when needed.

1717set(CMAKE_AUTOMOC ON)

18+set(CMAKE_AUTORCC ON)

1819

1920# enable QML debugging

2021string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

tests/mocks/Unity/Application/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(FakeUnityApplicationQml_SOURCES

1616 UbuntuKeyboardInfo.cpp

1717 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

1818 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

19+ resources/surfaces.qrc

1920)

2021

2122add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−10

@@ -31,7 +31,7 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,

3131 MirSurfaceItem::Type type,

3232 MirSurfaceItem::State state,

3333 const QUrl& screenshot,

34− const QString &qmlFilePath,

34+ const QUrl& qmlFileUrl,

3535 QQuickItem *parent)

3636 : QQuickItem(parent)

3737 , m_session(nullptr)

@@ -62,15 +62,7 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,

6262 QQuickView *quickView =

6363 qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

6464

65− QString qmlComponentFilePath;

66− if (!qmlFilePath.isEmpty()) {

67− qmlComponentFilePath.append(qmlFilePath);

68− } else {

69− qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")

70− .arg(mockPluginsDir());

71− }

72−

73− m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);

65+ m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlFileUrl);

7466

7567 switch (m_qmlContentComponent->status()) {

7668 case QQmlComponent::Ready:

tests/mocks/Unity/Application/MirSurfaceItem.h+1−1

@@ -118,7 +118,7 @@ private:

118118 Type type,

119119 State state,

120120 const QUrl& screenshot,

121− const QString &qmlFilePath = QString(),

121+ const QUrl& qmlFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml"),

122122 QQuickItem *parent = 0);

123123

124124 void createQmlContentItem();

tests/mocks/Unity/Application/SurfaceManager.cpp+2−8

@@ -79,18 +79,12 @@ MirSurfaceItem *SurfaceManager::inputMethodSurface()

7979{

8080 if (!m_virtualKeyboard) {

8181

82− QString screenshotPath = QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")

83− .arg(qmlDirectory());

84−

85− QString qmlFilePath = QString("%1/Unity/Application/VirtualKeyboard.qml")

86− .arg(mockPluginsDir());

87−

8882 m_virtualKeyboard = new MirSurfaceItem(

8983 "input-method",

9084 MirSurfaceItem::InputMethod,

9185 MirSurfaceItem::Minimized,

92− screenshotPath,

93− qmlFilePath);

86+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),

87+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"));

9488 Q_EMIT surfaceCreated(m_virtualKeyboard);

9589 }

9690 return m_virtualKeyboard;

tests/mocks/Unity/Application/MirSurfaceItem.qml → tests/mocks/Unity/Application/resources/MirSurfaceItem.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/VirtualKeyboard.qml → tests/mocks/Unity/Application/resources/VirtualKeyboard.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/resources/surfaces.qrcnew file+7

@@ -0,0 +1,7 @@

1+<RCC>

2+ <qresource prefix="/Unity/Application">

3+ <file>VirtualKeyboard.qml</file>

4+ <file>MirSurfaceItem.qml</file>

5+ <file>vkb_portrait.png</file>

6+ </qresource>

7+</RCC>

tests/mocks/Unity/Application/resources/vkb_portrait.pngnew file

Binary file not shown.