Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge versioning and travis build config #3540

Merged
merged 12 commits into from
Oct 8, 2019
Merged

Merge versioning and travis build config #3540

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6152773
Fix Issue #3452, change header declaration
DonPavlov Oct 1, 2019
614bea3
change whitespace
DonPavlov Oct 1, 2019
f97ed51
Use keyword 'develop' to specify debug builds (align with branch names)
KjellMorgenstern Oct 4, 2019
355bf8b
Add override and warning for dynamic libgit2
KjellMorgenstern Oct 6, 2019
2864e2f
Enable fast_check again
KjellMorgenstern Oct 6, 2019
0fcc6ac
Use current git hash and tag for versioning. Adapt layout
KjellMorgenstern Oct 6, 2019
7299130
Fix linux archive on develop builds
KjellMorgenstern Oct 7, 2019
b1bc704
Pass on travis variables to docker, cleanups
KjellMorgenstern Oct 7, 2019
1121e07
Shell linting
KjellMorgenstern Oct 7, 2019
61ad6a3
Add static libgit2 for fedora (dynamic also builds, but is switched of)
KjellMorgenstern Oct 7, 2019
a553997
Travis slug->repo
KjellMorgenstern Oct 7, 2019
b0243dc
Add branch wildcard for travis
KjellMorgenstern Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change whitespace
  • Loading branch information
@DonPavlov @KjellMorgenstern
DonPavlov authored and KjellMorgenstern committed Oct 6, 2019
commit 614bea37588865e059e958f135702df9cf300263
2 changes: 1 addition & 1 deletion src/utils/folderutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class FolderUtils
static void cleanup();
static void collectFiles(const QDir & parent, QStringList & filters, QStringList & files, bool recursive);
static void makePartFolderHierarchy(const QString & prefixFolder, const QString & destFolder);
static void copyBin(const QString & dest, const QString & source);
static void copyBin(const QString & dest, const QString & source);
static bool slamCopy(QFile &, const QString & dest);
static void showInFolder(const QString & path);
static void createUserDataStoreFolders();
Expand Down