Skip to content

Commit cc68ee2

Browse files
uvatbcnyalldawson
authored andcommitted
Fix for qOverload and git ignore a bunch of intermediates
1. Change compiler req to c++14 because thats what qOverload needs 2. Add a bunch of intermediate files into the .gitignore
1 parent 5c78a58 commit cc68ee2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.gitignore

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
*CMakeLists.txt.user
22
_build/
33
*.DS_Store
4-
o2.pro.user
4+
o2.pro.user
5+
6+
# Intermediates
7+
.qmake.stash
8+
Makefile
9+
*.o
10+
moc_*
11+
libo2.so*

o2.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TEMPLATE = lib
99
DEFINES += O2_SHARED_LIB
1010
DEFINES += O2_DLL_EXPORT
1111

12-
CONFIG += c++11
12+
CONFIG += c++14
1313

1414
# The following define makes your compiler emit warnings if you use
1515
# any Qt feature that has been marked deprecated (the exact warnings

0 commit comments

Comments
 (0)