git.iko.soy/unity8
on xenial help sign in
Further build fixes
c7f5a67Michael Terry
plugins/Wizard/PageList.cpp+3−3
compare with xenial
unifiedsplit
@@ -45,10 +45,10 @@ PageList::PageList(QObject *parent)
45 QSet<QString> disabledPages;
45 QSet<QString> disabledPages;
46 QStringList dataDirs;
46 QStringList dataDirs;
47
47
48− if (isRunningInstalled()) {
48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
49− dataDirs = shellDataDirs();
50− } else {
51 dataDirs = QStringList() << qmlDirectory();
49 dataDirs = QStringList() << qmlDirectory();
50+ } else {
51+ dataDirs = shellDataDirs();
52 }
52 }
53
53
54 Q_FOREACH(const QString &dataDir, dataDirs) {
54 Q_FOREACH(const QString &dataDir, dataDirs) {
qml/CMakeLists.txt+1
@@ -13,6 +13,7 @@ set(QML_DIRS
13 Launcher
13 Launcher
14 Stages
14 Stages
15 Notifications
15 Notifications
16+ Wizard
16 )
17 )
17
18
18install(DIRECTORY ${QML_DIRS}
19install(DIRECTORY ${QML_DIRS}
tests/plugins/Wizard/CMakeLists.txt+2−1
@@ -8,4 +8,5 @@ add_executable(tst-pagelist
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
9)
9)
10qt5_use_modules(tst-pagelist Core Qml Test)
10qt5_use_modules(tst-pagelist Core Qml Test)
11−add_test(tst-pagelist tst-pagelist)
11+
12+add_test(NAME pagelisttest COMMAND env UNITY_TEST_ENV=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-pagelist)