git.iko.soy/unity8
on xenial help sign in
Further build fixes
commitc7f5a6799aed7cd51fe1c18562261436d2662973 authorMichael Terry <michael.terry@canonical.com> dateFri 14 Nov 2014, 18:30 (12 years ago) parentad34824
3 files changed+6−4
compare with xenial
unifiedsplit
plugins/Wizard/PageList.cpp+3−3 qml/CMakeLists.txt+1 tests/plugins/Wizard/CMakeLists.txt+2−1
plugins/Wizard/PageList.cpp+3−3
@@ -45,10 +45,10 @@ PageList::PageList(QObject *parent)
4545 QSet<QString> disabledPages;
4646 QStringList dataDirs;
4747
48− if (isRunningInstalled()) {
49− dataDirs = shellDataDirs();
50− } else {
48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
5149 dataDirs = QStringList() << qmlDirectory();
50+ } else {
51+ dataDirs = shellDataDirs();
5252 }
5353
5454 Q_FOREACH(const QString &dataDir, dataDirs) {
qml/CMakeLists.txt+1
@@ -13,6 +13,7 @@ set(QML_DIRS
1313 Launcher
1414 Stages
1515 Notifications
16+ Wizard
1617 )
1718
1819install(DIRECTORY ${QML_DIRS}
tests/plugins/Wizard/CMakeLists.txt+2−1
@@ -8,4 +8,5 @@ add_executable(tst-pagelist
88 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
99)
1010qt5_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)