diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7758e1ae75..8fdfb5fbf8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,33 @@ on: types: [ created ] jobs: + windows-qt: + runs-on: windows-2019 + steps: + - uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + modules: qtwebengine + - name: Install dependencies + shell: bash + run: | + choco install openssl + - name: Build the application + shell: bash + run: | + mkdir build + cd build + export CMAKE_PREFIX_PATH="$Qt5_Dir/lib/cmake" + export PATH="$Qt5_Dir/bin":"$PATH" + kit=$(ls "/c/Program Files (x86)/Windows Kits/10/bin/"*"/x64/mc.exe" | head -n1 | sed s/mc.exe//) + export PATH="$kit":"$PATH" + export OPENSSL_ROOT_DIR="/c/Program Files/OpenSSL-Win64" + cmake -DCMAKE_BUILD_TYPE=Release -DTOGGL_BUILD_TESTS=OFF -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" .. + cmake --build . --config Release -- -m + macos-qt: runs-on: macOS-latest steps: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2adbdb8635..8bfb580362 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,7 +30,7 @@ include_directories( ${LUA_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS} ${POCO_INCLUDE_DIRS} - $ENV{OPENSSL_ROOT_DIR}/include + "$ENV{OPENSSL_ROOT_DIR}/include" ) # TogglDesktopLibrary sources diff --git a/src/ui/linux/TogglDesktop/main.cpp b/src/ui/linux/TogglDesktop/main.cpp index 67eefbcdb2..ae7fad1441 100644 --- a/src/ui/linux/TogglDesktop/main.cpp +++ b/src/ui/linux/TogglDesktop/main.cpp @@ -81,7 +81,7 @@ void setOptions(const TogglApplication &a) { parser.addOption(forceOption); if (parser.isSet(forceStagingOption)) { - toggl::urls::SetUseStagingAsBackend(true); + toggl_set_staging_override(true); } parser.process(a); diff --git a/src/ui/linux/TogglDesktop/toggl.cpp b/src/ui/linux/TogglDesktop/toggl.cpp index 4545fb75a7..7f671868e4 100644 --- a/src/ui/linux/TogglDesktop/toggl.cpp +++ b/src/ui/linux/TogglDesktop/toggl.cpp @@ -187,14 +187,14 @@ void on_display_timer_state( } void on_display_idle_notification( - const char_t*guid, - const char_t*since, - const char_t*duration, + const char_t *guid, + const char_t *since, + const char_t *duration, const int64_t started, - const char *description, - const char *project, - const char *task, - const char *projectColor) { + const char_t *description, + const char_t *project, + const char_t *task, + const char_t *projectColor) { TogglApi::instance->displayIdleNotification( toQString(guid), toQString(since), @@ -635,7 +635,7 @@ QString TogglApi::start(const QString description, task_id, project_id, nullptr /* project guid */, - tags.toStdString().c_str() /* tags */, + toLocalString(tags) /* tags */, false, 0, 0);