File tree Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Original file line number Diff line number Diff line change 30
30
matrix :
31
31
config :
32
32
- name : " ubuntu-22.04"
33
- os : " ubuntu-latest "
33
+ os : " ubuntu-22.04 "
34
34
- name : " ubuntu-20.04"
35
35
os : " ubuntu-20.04"
36
36
- name : " ubuntu-18.04"
51
51
- name : " macOS-10"
52
52
os : " macos-10.15"
53
53
steps :
54
- - uses : actions/checkout@v2
54
+ - uses : actions/checkout@v3
55
55
56
56
- name : Install liblsl (Ubuntu)
57
57
if : startsWith(matrix.config.os, 'ubuntu-')
72
72
73
73
- name : Install Qt (Window and Ubuntu bionic)
74
74
if : (matrix.config.os == 'windows-latest') || (matrix.config.os == 'ubuntu-18.04')
75
- uses : jurplel/install-qt-action@v2.14 .0
75
+ uses : jurplel/install-qt-action@v3.0 .0
76
76
with :
77
77
version : ${{ matrix.config.qt_ver }}
78
78
arch : ${{ matrix.config.qt_arch }}
99
99
-DLSL_INSTALL_ROOT=$PWD/LSL/ \
100
100
-DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON \
101
101
${{ matrix.config.cmake_extra }}
102
+ if [[ "${{ matrix.config.name }}" = ubuntu-* ]]; then
103
+ cmake -DLSL_UNIXFOLDERS=ON build
104
+ fi
102
105
103
106
- name : make
104
107
run : cmake --build build --config Release -j --target install
@@ -110,7 +113,7 @@ jobs:
110
113
cmake -E remove_directory package/_CPack_Packages
111
114
112
115
- name : Upload Artifacts
113
- uses : actions/upload-artifact@v2
116
+ uses : actions/upload-artifact@v3
114
117
with :
115
118
name : pkg-${{ matrix.config.name }}
116
119
path : package
Original file line number Diff line number Diff line change @@ -585,9 +585,12 @@ QString MainWindow::find_config_file(const char *filename) {
585
585
qInfo () << defaultCfgFilename;
586
586
QStringList cfgpaths;
587
587
cfgpaths << QDir::currentPath ()
588
- << QStandardPaths::standardLocations (QStandardPaths::ConfigLocation) << exeInfo.path ();
588
+ << QStandardPaths::standardLocations (QStandardPaths::AppConfigLocation)
589
+ << QStandardPaths::standardLocations (QStandardPaths::AppDataLocation)
590
+ << exeInfo.path ();
589
591
for (const auto &path : qAsConst (cfgpaths)) {
590
592
QString cfgfilepath = path + QDir::separator () + defaultCfgFilename;
593
+ qInfo () << cfgfilepath;
591
594
if (QFileInfo::exists (cfgfilepath)) return cfgfilepath;
592
595
}
593
596
QMessageBox::warning (this , " No config file not found" ,
You can’t perform that action at this time.
0 commit comments