Skip to content

Commit ba06d5a

Browse files
committed
Small adjustments made
ClangFormat added Code style updated Version bumped
1 parent 5734444 commit ba06d5a

File tree

6 files changed

+1231
-691
lines changed

6 files changed

+1231
-691
lines changed

.clang-format

Lines changed: 270 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,270 @@
1+
# yaml-language-server: $schema=https://json.schemastore.org/clang-format.json
2+
---
3+
Language: Cpp
4+
AccessModifierOffset: -4
5+
AlignAfterOpenBracket: Align
6+
AlignArrayOfStructures: None
7+
AlignConsecutiveAssignments:
8+
Enabled: false
9+
AcrossEmptyLines: false
10+
AcrossComments: false
11+
AlignCompound: false
12+
PadOperators: false
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
PadOperators: false
19+
AlignConsecutiveDeclarations:
20+
Enabled: false
21+
AcrossEmptyLines: false
22+
AcrossComments: false
23+
AlignCompound: false
24+
PadOperators: false
25+
AlignConsecutiveMacros:
26+
Enabled: false
27+
AcrossEmptyLines: false
28+
AcrossComments: false
29+
AlignCompound: false
30+
PadOperators: false
31+
AlignConsecutiveShortCaseStatements:
32+
Enabled: false
33+
AcrossEmptyLines: false
34+
AcrossComments: false
35+
AlignCaseColons: false
36+
AlignEscapedNewlines: DontAlign
37+
AlignOperands: Align
38+
AlignTrailingComments:
39+
Kind: Always
40+
OverEmptyLines: 0
41+
AllowAllArgumentsOnNextLine: true
42+
AllowAllParametersOfDeclarationOnNextLine: true
43+
AllowShortBlocksOnASingleLine: Never
44+
AllowShortCaseLabelsOnASingleLine: false
45+
AllowShortEnumsOnASingleLine: true
46+
AllowShortFunctionsOnASingleLine: Inline
47+
AllowShortIfStatementsOnASingleLine: Never
48+
AllowShortLambdasOnASingleLine: All
49+
AllowShortLoopsOnASingleLine: false
50+
AlwaysBreakAfterDefinitionReturnType: None
51+
AlwaysBreakAfterReturnType: None
52+
AlwaysBreakBeforeMultilineStrings: false
53+
AlwaysBreakTemplateDeclarations: Yes
54+
AttributeMacros:
55+
- __capability
56+
BinPackArguments: false
57+
BinPackParameters: false
58+
BitFieldColonSpacing: Both
59+
BraceWrapping:
60+
AfterCaseLabel: false
61+
AfterClass: true
62+
AfterControlStatement: Never
63+
AfterEnum: false
64+
AfterExternBlock: false
65+
AfterFunction: true
66+
AfterNamespace: false
67+
AfterObjCDeclaration: false
68+
AfterStruct: true
69+
AfterUnion: false
70+
BeforeCatch: false
71+
BeforeElse: false
72+
BeforeLambdaBody: false
73+
BeforeWhile: false
74+
IndentBraces: false
75+
SplitEmptyFunction: false
76+
SplitEmptyRecord: false
77+
SplitEmptyNamespace: false
78+
BreakAfterAttributes: Never
79+
BreakAfterJavaFieldAnnotations: false
80+
BreakArrays: true
81+
BreakBeforeBinaryOperators: All
82+
BreakBeforeConceptDeclarations: Always
83+
BreakBeforeBraces: Custom
84+
BreakBeforeInlineASMColon: OnlyMultiline
85+
BreakBeforeTernaryOperators: true
86+
BreakConstructorInitializers: BeforeComma
87+
BreakInheritanceList: BeforeColon
88+
BreakStringLiterals: true
89+
ColumnLimit: 88
90+
CommentPragmas: '^ IWYU pragma:'
91+
CompactNamespaces: false
92+
ConstructorInitializerIndentWidth: 4
93+
ContinuationIndentWidth: 4
94+
Cpp11BracedListStyle: true
95+
DerivePointerAlignment: false
96+
DisableFormat: false
97+
EmptyLineAfterAccessModifier: Never
98+
EmptyLineBeforeAccessModifier: LogicalBlock
99+
ExperimentalAutoDetectBinPacking: false
100+
FixNamespaceComments: true
101+
ForEachMacros:
102+
- forever
103+
- foreach
104+
- Q_FOREACH
105+
- BOOST_FOREACH
106+
IfMacros:
107+
- KJ_IF_MAYBE
108+
IncludeBlocks: Preserve
109+
IncludeCategories:
110+
- Regex: '^<Q.*'
111+
Priority: 200
112+
SortPriority: 200
113+
CaseSensitive: true
114+
IncludeIsMainRegex: '(Test)?$'
115+
IncludeIsMainSourceRegex: ''
116+
IndentAccessModifiers: false
117+
IndentCaseBlocks: false
118+
IndentCaseLabels: false
119+
IndentExternBlock: AfterExternBlock
120+
IndentGotoLabels: true
121+
IndentPPDirectives: None
122+
IndentRequiresClause: true
123+
IndentWidth: 4
124+
IndentWrappedFunctionNames: false
125+
InsertBraces: false
126+
InsertNewlineAtEOF: false
127+
InsertTrailingCommas: None
128+
IntegerLiteralSeparator:
129+
Binary: 0
130+
BinaryMinDigits: 0
131+
Decimal: 0
132+
DecimalMinDigits: 0
133+
Hex: 0
134+
HexMinDigits: 0
135+
JavaScriptQuotes: Leave
136+
JavaScriptWrapImports: true
137+
KeepEmptyLinesAtTheStartOfBlocks: false
138+
KeepEmptyLinesAtEOF: false
139+
LambdaBodyIndentation: Signature
140+
LineEnding: DeriveLF
141+
MacroBlockBegin: ''
142+
MacroBlockEnd: ''
143+
MaxEmptyLinesToKeep: 1
144+
NamespaceIndentation: All
145+
ObjCBinPackProtocolList: Auto
146+
ObjCBlockIndentWidth: 4
147+
ObjCBreakBeforeNestedBlockParam: true
148+
ObjCSpaceAfterProperty: false
149+
ObjCSpaceBeforeProtocolList: true
150+
PackConstructorInitializers: BinPack
151+
PenaltyBreakAssignment: 100
152+
PenaltyBreakBeforeFirstCallParameter: 300
153+
PenaltyBreakComment: 500
154+
PenaltyBreakFirstLessLess: 400
155+
PenaltyBreakOpenParenthesis: 0
156+
PenaltyBreakString: 600
157+
PenaltyBreakTemplateDeclaration: 10
158+
PenaltyExcessCharacter: 50
159+
PenaltyIndentedWhitespace: 0
160+
PenaltyReturnTypeOnItsOwnLine: 300
161+
PointerAlignment: Left
162+
PPIndentWidth: -1
163+
QualifierAlignment: Leave
164+
ReferenceAlignment: Pointer
165+
ReflowComments: false
166+
RemoveBracesLLVM: false
167+
RemoveParentheses: Leave
168+
RemoveSemicolon: false
169+
RequiresClausePosition: OwnLine
170+
RequiresExpressionIndentation: OuterScope
171+
SeparateDefinitionBlocks: Leave
172+
ShortNamespaceLines: 1
173+
SortIncludes: CaseSensitive
174+
SortJavaStaticImport: Before
175+
SortUsingDeclarations: Lexicographic
176+
SpaceAfterCStyleCast: true
177+
SpaceAfterLogicalNot: false
178+
SpaceAfterTemplateKeyword: true
179+
SpaceAroundPointerQualifiers: Default
180+
SpaceBeforeAssignmentOperators: true
181+
SpaceBeforeCaseColon: false
182+
SpaceBeforeCpp11BracedList: false
183+
SpaceBeforeCtorInitializerColon: true
184+
SpaceBeforeInheritanceColon: true
185+
SpaceBeforeJsonColon: false
186+
SpaceBeforeParens: ControlStatements
187+
SpaceBeforeParensOptions:
188+
AfterControlStatements: true
189+
AfterForeachMacros: true
190+
AfterFunctionDefinitionName: false
191+
AfterFunctionDeclarationName: false
192+
AfterIfMacros: true
193+
AfterOverloadedOperator: false
194+
AfterRequiresInClause: false
195+
AfterRequiresInExpression: false
196+
BeforeNonEmptyParentheses: false
197+
SpaceBeforeRangeBasedForLoopColon: true
198+
SpaceBeforeSquareBrackets: false
199+
SpaceInEmptyBlock: false
200+
SpacesBeforeTrailingComments: 1
201+
SpacesInAngles: Never
202+
SpacesInContainerLiterals: false
203+
SpacesInLineCommentPrefix:
204+
Minimum: 1
205+
Maximum: -1
206+
SpacesInParens: Never
207+
SpacesInParensOptions:
208+
InCStyleCasts: false
209+
InConditionalStatements: false
210+
InEmptyParentheses: false
211+
Other: false
212+
SpacesInSquareBrackets: false
213+
Standard: Auto
214+
StatementAttributeLikeMacros:
215+
- Q_EMIT
216+
StatementMacros:
217+
- Q_UNUSED
218+
- QT_REQUIRE_VERSION
219+
- Q_CLASSINFO
220+
- Q_ENUM
221+
- Q_ENUM_NS
222+
- Q_FLAG
223+
- Q_FLAG_NS
224+
- Q_GADGET
225+
- Q_GADGET_EXPORT
226+
- Q_INTERFACES
227+
- Q_MOC_INCLUDE
228+
- Q_NAMESPACE
229+
- Q_NAMESPACE_EXPORT
230+
- Q_OBJECT
231+
- Q_PROPERTY
232+
- Q_REVISION
233+
- Q_DISABLE_COPY
234+
- Q_SET_OBJECT_NAME
235+
- QT_BEGIN_NAMESPACE
236+
- QT_END_NAMESPACE
237+
- QML_ADDED_IN_MINOR_VERSION
238+
- QML_ANONYMOUS
239+
- QML_ATTACHED
240+
- QML_DECLARE_TYPE
241+
- QML_DECLARE_TYPEINFO
242+
- QML_ELEMENT
243+
- QML_EXTENDED
244+
- QML_EXTENDED_NAMESPACE
245+
- QML_EXTRA_VERSION
246+
- QML_FOREIGN
247+
- QML_FOREIGN_NAMESPACE
248+
- QML_IMPLEMENTS_INTERFACES
249+
- QML_INTERFACE
250+
- QML_NAMED_ELEMENT
251+
- QML_REMOVED_IN_MINOR_VERSION
252+
- QML_SINGLETON
253+
- QML_UNAVAILABLE
254+
- QML_UNCREATABLE
255+
- QML_VALUE_TYPE
256+
TabWidth: 4
257+
UseTab: Never
258+
VerilogBreakBetweenInstancePorts: true
259+
WhitespaceSensitiveMacros:
260+
- BOOST_PP_STRINGIZE
261+
- CF_SWIFT_NAME
262+
- NS_SWIFT_NAME
263+
- PP_STRINGIZE
264+
- STRINGIZE
265+
BreakBeforeInheritanceComma: false
266+
BreakConstructorInitializersBeforeComma: false
267+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
268+
SpaceInEmptyParentheses: false
269+
SpacesInCStyleCastParentheses: false
270+
SpacesInParentheses: false

.gitignore

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*_pch.h.cpp
1313
*_resource.rc
1414
*.qm
15+
**/.qmlls.ini
1516
.#*
1617
*.*#
1718
core
@@ -28,7 +29,6 @@ ui_*.h
2829
qrc_*.cpp
2930
Thumbs.db
3031
*.res
31-
*.rc
3232
/.qmake.cache
3333
/.qmake.stash
3434

@@ -68,3 +68,7 @@ Thumbs.db
6868
# --------
6969
*.dll
7070
*.exe
71+
72+
# Build folder
73+
# --------
74+
build/*

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(Options)
99

1010
project(linuxdeployqt
1111
LANGUAGES CXX
12-
VERSION 2.4.0
12+
VERSION 2.4.1
1313
HOMEPAGE_URL omergoktas.com
1414
DESCRIPTION "Qt dependency deployment tool for Linux."
1515
)

0 commit comments

Comments
 (0)