Skip to content

Commit 63c7b70

Browse files
Linux build fixed
1 parent d8858f5 commit 63c7b70

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

global.pri

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,18 @@ unix {
6060
defineTest(copyToDestdir) {
6161
FILES = $$1
6262

63-
for (FILE, FILES) {
63+
for(FILE, FILES) {
6464
# This ugly code is needed because xcopy requires to add source directory name to target directory name when copying directories
6565
win32:AFTER_SLASH = $$section(FILE, "/", -1, -1)
6666
win32:BASE_NAME = $$section(FILE, "/", -2, -2)
6767
win32:equals(AFTER_SLASH, ""):DESTDIR_SUFFIX = /$$BASE_NAME
6868

6969
win32:FILE ~= s,/$,,g
7070

71-
FILE = $$shell_path($$FILE)
72-
DDIR = $$shell_path($$DESTDIR$$DESTDIR_SUFFIX/)
73-
71+
win32:FILE ~= s,/,\,g
72+
DDIR = $$DESTDIR$$DESTDIR_SUFFIX/
73+
win32:DDIR ~= s,/,\,g
74+
7475
QMAKE_POST_LINK += $(COPY_DIR) $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
7576
}
7677

trikControl/src/linux/keysWorker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License. */
1414

15-
#include "keysWorker.h"
15+
#include "src/keysWorker.h"
1616

1717
#include <QtCore/QDebug>
1818
#include <unistd.h>

0 commit comments

Comments
 (0)