Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_settings
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmp_settings
Commits
2d60c47b
Commit
2d60c47b
authored
Nov 07, 2017
by
gujin.wang
Browse files
Options
Browse Files
Download
Plain Diff
修改读取配置文件的key
parents
38f4b78f
079792a1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
6 deletions
+17
-6
fmp_settings.cpp
+1
-1
fmp_settings.h
+2
-1
fmp_settings.pro
+11
-1
ui/window.cpp
+1
-1
version.h
+2
-2
No files found.
fmp_settings.cpp
View file @
2d60c47b
...
...
@@ -25,7 +25,7 @@ FMPSettings::~FMPSettings()
if
(
d_ptr
)
{
delete
d_ptr
;
d_ptr
=
nullptr
;
d_ptr
=
0
;
}
}
...
...
fmp_settings.h
View file @
2d60c47b
...
...
@@ -2,7 +2,8 @@
#define FMP_SETTINGS_H
#include "fmp_settings_i.h"
#include "ui./window.h"
#include "ui/window.h"
class
FMPSettingsPrivate
;
...
...
fmp_settings.pro
View file @
2d60c47b
...
...
@@ -24,8 +24,14 @@ unix {
#Target name
VER
=
$$
system
(
$$
PWD
/../
fmprc
.
bat
$$
TARGET
)
ORIGIN_TARGET
=
$$
TARGET
TARGET
=
$$
{
TARGET
}
_
$$
{
VER
}
win32
{
TARGET
=
$$
{
TARGET
}
_
$$
{
VER
}
}
else
{
TARGET
=
$$
{
TARGET
}
}
#Header path
INCLUDEPATH
+=
$$
PWD
/../
include
/
ctk
\
...
...
@@ -37,7 +43,11 @@ LIBS += -L$$PWD/../lib
CONFIG
(
debug
,
debug
|
release
)
{
#
Linking
library
win32
{
LIBS
+=
-
lCTKCored
-
lCTKPluginFrameworkd
}
else
{
LIBS
+=
-
lCTKCore
-
lCTKPluginFramework
}
#
Destination
path
DESTDIR
=
$$
PWD
/../
debug
/
plugins
}
else
{
...
...
ui/window.cpp
View file @
2d60c47b
#
include
<
QLineEdit
>
#include <QCheckBox>
#include <QComboBox>
#include <
q
Debug>
#include <
Q
Debug>
#include <QScrollBar>
#include <QPropertyAnimation>
...
...
version.h
View file @
2d60c47b
...
...
@@ -3,9 +3,9 @@
#define VER_MAJOR 0
#define VER_MINOR 1
#define VER_REVISION
1
#define VER_REVISION
0
#define VER_BUILD 1
2
#define VER_BUILD 1
4
//! Convert version numbers to string
#define _STR(S) #S
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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