Skip to content
This repository has been archived by the owner on May 3, 2019. It is now read-only.

Switch from CMake to Qbs #213

Merged
merged 94 commits into from
Mar 13, 2018
Merged

Switch from CMake to Qbs #213

merged 94 commits into from
Mar 13, 2018

Commits on Jan 21, 2018

  1. Try qbs instead of cmake

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    4679d59 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2018

  1. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 28, 2018
    Configuration menu
    Copy the full SHA
    547b1f9 View commit details
    Browse the repository at this point in the history

  2. Trying to use qbs instead of cmake

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 28, 2018
    Configuration menu
    Copy the full SHA
    2cf8ed7 View commit details
    Browse the repository at this point in the history

  3. Improve qbs files

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 28, 2018
    Configuration menu
    Copy the full SHA
    e9c3fc4 View commit details
    Browse the repository at this point in the history

  4. Fix build on MacOs

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 28, 2018
    Configuration menu
    Copy the full SHA
    2c56388 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2018

  1. Fix window not showing on OSX

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    8a108b9 View commit details
    Browse the repository at this point in the history

  2. Always build libs as static libraries 

    This might change in then future when we'll have native plugins but for now static libs are simpler to manage...
    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    f38be4a View commit details
    Browse the repository at this point in the history

  3. Use "import qbs" instead of "import qbs 1.0"

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    a264cae View commit details
    Browse the repository at this point in the history

  4. Move web plugins in a subfolder

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    f805043 View commit details
    Browse the repository at this point in the history

  5. Add qbs install rule for web plugins

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    f616543 View commit details
    Browse the repository at this point in the history

  6. Working on tests

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    8ddc229 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Fix build date format 

    All infrastructure unit tests are now passing again
    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    8c51a17 View commit details
    Browse the repository at this point in the history

  2. Improve project organization

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    ef9b7a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Automatically generate imports for qml and translation files

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    92c7e6c View commit details
    Browse the repository at this point in the history

  2. Remove annoying print statement in tests

    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    4f30ce6 View commit details
    Browse the repository at this point in the history

  3. Don't run unit tests at the end of build 

    This is annoying if you have to debug a test failure
    @ColinDuquesnoy
    ColinDuquesnoy committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    3cdb2c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Add some qbs tools to help generate translations

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    da939de View commit details
    Browse the repository at this point in the history

  2. Fix another build date format issue

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    9051f49 View commit details
    Browse the repository at this point in the history

  3. Add a qbs file for each test executable 

    and improve project organization
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    ba67b1e View commit details
    Browse the repository at this point in the history

  4. Allow to build with system qxtglobalshortcut 

    With pkg-config
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    63ee9bd View commit details
    Browse the repository at this point in the history

  5. Add qbs target to update qmldir

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    6d050e4 View commit details
    Browse the repository at this point in the history

  6. Rename SettingsTranslator.js.in qbs target to update_settings_translator 

    and improve the target to not being run by default and always run when triggered explicitely
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    eab3cd8 View commit details
    Browse the repository at this point in the history

  7. Add MellowPlayerLib product template

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    765448d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    65f64b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. Add better warning granularity (gcc only)

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    942e0cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    13b852c View commit details
    Browse the repository at this point in the history

  3. Add precompiled headers and a target to build documentation

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    8a86da7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    9b3dc43 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    76f69da View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Fix windows build issues

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    4bebe40 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    400181a View commit details
    Browse the repository at this point in the history

  3. Mark file download as may fail 

    This integration test might because it depends on the infrastructure. The test now randomly fails even if the code has not changed at all
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    cd41fb0 View commit details
    Browse the repository at this point in the history

  4. Use console application for tests only on windows

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    3a9f0c2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    9f786b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    6a16463 View commit details
    Browse the repository at this point in the history

  2. Add code coverage support 

    and update travis build script instructions
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    4735574 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2018

  1. Use Qt 5.10 on travis ci

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    9c83e65 View commit details
    Browse the repository at this point in the history

  2. Update ubuntu-14.04-env-setup.sh 

    Install qbs 1.10.1 from sources
    @ColinDuquesnoy
    ColinDuquesnoy authored Feb 17, 2018
    Configuration menu
    Copy the full SHA
    f9dc31c View commit details
    Browse the repository at this point in the history

  3. Update ubuntu-14.04-env-setup.sh

    @ColinDuquesnoy
    ColinDuquesnoy authored Feb 17, 2018
    Configuration menu
    Copy the full SHA
    744d87e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. Travis: ubuntu 14.04 setup

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    c291b61 View commit details
    Browse the repository at this point in the history

  2. Travis: osx setup

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    f822dd4 View commit details
    Browse the repository at this point in the history

  3. Cleanup

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    6b8cd57 View commit details
    Browse the repository at this point in the history

  4. AppVeyor: windows commit build

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    0575a42 View commit details
    Browse the repository at this point in the history

  5. Fix appveyor init script

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    93c8408 View commit details
    Browse the repository at this point in the history

  6. Fix appveyor init script

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    6c83f85 View commit details
    Browse the repository at this point in the history

  7. AppVeyor: use c++17 standard (now building with msvc2017)

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    6153433 View commit details
    Browse the repository at this point in the history

  8. AppVeyor: use qbs 1.10.1

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    9e71e93 View commit details
    Browse the repository at this point in the history

  9. AppVeyor: fix errors

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    dbb5ef7 View commit details
    Browse the repository at this point in the history

  10. Cleanu platform cxx flags for tests

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    34542c1 View commit details
    Browse the repository at this point in the history

  11. Update make_appimage script

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    99468f9 View commit details
    Browse the repository at this point in the history

  12. make_appimage: fix syntax issues

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    f5ff8a0 View commit details
    Browse the repository at this point in the history

  13. Update make_dmg script

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    981a6e8 View commit details
    Browse the repository at this point in the history

  14. Travis: add missing dependencies for appimage

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    4c3b142 View commit details
    Browse the repository at this point in the history

  15. OSX dmg fix plugins path

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    0861863 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    d7bb69c View commit details
    Browse the repository at this point in the history

  17. Fix copying plugins to .app

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    4d8574b View commit details
    Browse the repository at this point in the history

  18. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    c294177 View commit details
    Browse the repository at this point in the history

  19. Travis: use qt 5.9.3

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    a1c3b62 View commit details
    Browse the repository at this point in the history

  20. OSX: load plugins from PlugIns/services/web

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    c56529c View commit details
    Browse the repository at this point in the history

  21. Fix ppa url

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    9317023 View commit details
    Browse the repository at this point in the history

  22. Travis: use a version of qbs built with Qt 5.9.3

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    22669be View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Try to fix static linking to libstdc++ when building appimage

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    f2c20ee View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. Enable qxtglobal shortcut initialization

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    0ea8955 View commit details
    Browse the repository at this point in the history

  2. Define USE_LIBNOTIFY when libnotify is found

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    c8db678 View commit details
    Browse the repository at this point in the history

  3. Try to fix dmg issues

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    ed8930e View commit details
    Browse the repository at this point in the history

  4. Fix windows build

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    ff0056b View commit details
    Browse the repository at this point in the history

  5. build qbs test runner on windows

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    4a7a85b View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    ec6129e View commit details
    Browse the repository at this point in the history

  7. Revert "build qbs test runner on windows" 

    This reverts commit 4a7a85b.
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    9e5b334 View commit details
    Browse the repository at this point in the history

  8. Windows packaging

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    3b01fc3 View commit details
    Browse the repository at this point in the history

  9. Fix syntax error in appveyor.yml

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    7bf1afe View commit details
    Browse the repository at this point in the history

  10. Add setup.iss to git

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    8c20758 View commit details
    Browse the repository at this point in the history

  11. Don't build innosetup installer by default 

    Must be built explicitely
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    563426c View commit details
    Browse the repository at this point in the history

  12. qbs project structure improvements

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    aba0130 View commit details
    Browse the repository at this point in the history

  13. AppVeyor fix runtests script

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    1e0f0b5 View commit details
    Browse the repository at this point in the history

  14. Revert "AppVeyor fix runtests script" 

    This reverts commit 1e0f0b5.
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    36b69ac View commit details
    Browse the repository at this point in the history

  15. Add mayfail flag to more integration tests 

    Those tests might fail due to network issues
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    e26e13c View commit details
    Browse the repository at this point in the history

  16. Use innosetup item only on windows

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    e12d7d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Try using qtci to download and install official qt version 

    This is to avoid issue with mac osx dmg installer that does not include a self contained QtWebEngineProcess
    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    d5ed4af View commit details
    Browse the repository at this point in the history

  2. Fix install-qt script extension

    @ColinDuquesnoy
    ColinDuquesnoy committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    9875e41 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2018

  1. Merge branch 'develop' into qbs

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    7da7eef View commit details
    Browse the repository at this point in the history

  2. Install official qt version on Travis CI 

    Linux only for now, build will fail on OSX
    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    fd1fe59 View commit details
    Browse the repository at this point in the history

  3. [Travis-CI] Install official Qt release on OSX

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    c3b49da View commit details
    Browse the repository at this point in the history

  4. [Travis-CI] Fix running all tests on OSX

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    b412dc8 View commit details
    Browse the repository at this point in the history

  5. [Travis-CI] Improve scripts

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    2bf0302 View commit details
    Browse the repository at this point in the history

  6. Add travis_wait for commands that could take time

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    d5a070e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2018

  1. [Travis-CI] Revert usage of qtci on linux

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    d54a273 View commit details
    Browse the repository at this point in the history

  2. [Travis-CI] Fix path to Qt install dir to create appimage

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    0113b7f View commit details
    Browse the repository at this point in the history

  3. Try to read CI build number

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    3491c29 View commit details
    Browse the repository at this point in the history

  4. Fix javascript error

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    60d0e75 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2018

  1. Update README.md

    @ColinDuquesnoy
    ColinDuquesnoy authored Mar 10, 2018
    Configuration menu
    Copy the full SHA
    72691c1 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @ColinDuquesnoy
    ColinDuquesnoy authored Mar 10, 2018
    Configuration menu
    Copy the full SHA
    8d09103 View commit details
    Browse the repository at this point in the history

  3. Update install.rst

    @ColinDuquesnoy
    ColinDuquesnoy committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    a5e579a View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @ColinDuquesnoy
    ColinDuquesnoy authored Mar 10, 2018
    Configuration menu
    Copy the full SHA
    0f919a1 View commit details
    Browse the repository at this point in the history