Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
189f7235
Commit
189f7235
authored
Jul 11, 2018
by
Sebastian Holtermann
Browse files
Autogen: Wrap moc/uic/rcc related variables in structs
parent
c6a80028
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Source/cmQtAutoGenInitializer.cxx
View file @
189f7235
This diff is collapsed.
Click to expand it.
Source/cmQtAutoGenInitializer.h
View file @
189f7235
...
...
@@ -72,17 +72,10 @@ private:
private:
cmGeneratorTarget
*
Target
;
bool
MocEnabled
;
bool
UicEnabled
;
bool
RccEnabled
;
bool
MultiConfig
;
// Qt
std
::
string
QtVersionMajor
;
std
::
string
QtVersionMinor
;
std
::
string
MocExecutable
;
std
::
string
UicExecutable
;
std
::
string
RccExecutable
;
std
::
vector
<
std
::
string
>
RccListOptions
;
// Configurations
std
::
string
ConfigDefault
;
std
::
vector
<
std
::
string
>
ConfigsList
;
...
...
@@ -101,21 +94,37 @@ private:
std
::
vector
<
std
::
string
>
Headers
;
std
::
vector
<
std
::
string
>
Sources
;
// Moc
std
::
string
MocPredefsCmd
;
std
::
set
<
std
::
string
>
MocSkip
;
std
::
string
MocIncludes
;
std
::
map
<
std
::
string
,
std
::
string
>
MocIncludesConfig
;
std
::
string
MocDefines
;
std
::
map
<
std
::
string
,
std
::
string
>
MocDefinesConfig
;
struct
{
bool
Enabled
;
std
::
string
Executable
;
std
::
string
PredefsCmd
;
std
::
set
<
std
::
string
>
Skip
;
std
::
string
Includes
;
std
::
map
<
std
::
string
,
std
::
string
>
ConfigIncludes
;
std
::
string
Defines
;
std
::
map
<
std
::
string
,
std
::
string
>
ConfigDefines
;
}
Moc
;
// Uic
std
::
set
<
std
::
string
>
UicSkip
;
std
::
vector
<
std
::
string
>
UicSearchPaths
;
std
::
string
UicOptions
;
std
::
map
<
std
::
string
,
std
::
string
>
UicOptionsConfig
;
std
::
vector
<
std
::
string
>
UicFileFiles
;
std
::
vector
<
std
::
vector
<
std
::
string
>>
UicFileOptions
;
struct
{
bool
Enabled
;
std
::
string
Executable
;
std
::
set
<
std
::
string
>
Skip
;
std
::
vector
<
std
::
string
>
SearchPaths
;
std
::
string
Options
;
std
::
map
<
std
::
string
,
std
::
string
>
ConfigOptions
;
std
::
vector
<
std
::
string
>
FileFiles
;
std
::
vector
<
std
::
vector
<
std
::
string
>>
FileOptions
;
}
Uic
;
// Rcc
std
::
vector
<
Qrc
>
Qrcs
;
struct
{
bool
Enabled
;
std
::
string
Executable
;
std
::
vector
<
std
::
string
>
ListOptions
;
std
::
vector
<
Qrc
>
Qrcs
;
}
Rcc
;
};
#endif
Brad King
@brad.king
mentioned in commit
102f51d0
·
Jul 13, 2018
mentioned in commit
102f51d0
mentioned in commit 102f51d0aad6826864d6c6da6c2c2f9c6682b28d
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment