git.iko.soy/unity8
on xenial help sign in
Merge pull request #91 from ubports/xenial_-_edge

Fixup u8 tests and remove oxide to make arm64 happy

commitccea24ea5ec0034d29b24ea736509ad9a081bd71 authorRodney <6557070+dobey@users.noreply.github.com> dateFri 8 Feb 2019, 16:34 (8 years ago) parent9f31e648b06ecf
4 files changed+7−5
compare with xenial
unifiedsplit
Jenkinsfile+1−1 debian/control−2 plugins/Wizard/System.cpp+5−1 qml/Stage/WindowResizeArea.qml+1−1
Jenkinsfile+1−1
@@ -34,7 +34,7 @@ build-binary.sh'''
3434 export DEBBUILDOPTS="-sa"
3535 export SKIP_ARCH_BUILD=false
3636 export SKIP_SOURCE_REMOVAL=true
37− #build-binary.sh'''
37+ build-binary.sh'''
3838 stash(includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt', name: 'build-arm64')
3939 cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
4040 }
debian/control−2
@@ -56,7 +56,6 @@ Build-Depends: cmake,
5656 qml-module-qtsysteminfo,
5757 qml-module-qttest,
5858 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
59− qml-module-ubuntu-web,
6059 qt5-default,
6160 qtbase5-dev (>= 5.4),
6261 qtbase5-dev-tools,
@@ -124,7 +123,6 @@ Depends: dmz-cursor-theme,
124123 qml-module-qtqml-statemachine,
125124 qml-module-qtquick-xmllistmodel,
126125 qml-module-qtsysteminfo,
127− qml-module-ubuntu-web,
128126 qtdeclarative5-qtmir-plugin (>= 0.4.8),
129127 qtdeclarative5-ubuntu-telephony0.1,
130128 ubuntu-system-settings (>= 0.4),
plugins/Wizard/System.cpp+5−1
@@ -119,7 +119,11 @@ void System::setWizardEnabled(bool enabled)
119119 if (QDir(wizardEnabledPath()).exists()) {
120120 QDir(wizardEnabledPath()).removeRecursively();
121121 }
122− QFile::copy(currentFrameworkPath(), wizardEnabledPath());
122+ if (!QFile::copy(currentFrameworkPath(), wizardEnabledPath())) {
123+ // Make en empty file if framework does not exist
124+ QFile f(wizardEnabledPath());
125+ f.open(QFile::WriteOnly);
126+ }
123127 m_fsWatcher.addPath(wizardEnabledPath());
124128 Q_EMIT wizardEnabledChanged();
125129 Q_EMIT isUpdateChanged();
qml/Stage/WindowResizeArea.qml+1−1
@@ -101,7 +101,7 @@ MouseArea {
101101 state = WindowStateStorage.WindowStateNormal;
102102 }
103103 windowStateStorage.saveState(root.windowId, state & ~WindowStateStorage.WindowStateMinimized); // clear the minimized bit when saving
104− // do not store window sizes if they are zero. this happens in staged mode
104+ // do not store window sizes if they are zero. this happens in staged mode
105105 if ( priv.normalWidth && priv.normalHeight ) {
106106 windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight));
107107 }