Commit 2d60c47b by gujin.wang

修改读取配置文件的key

parents 38f4b78f 079792a1
...@@ -25,7 +25,7 @@ FMPSettings::~FMPSettings() ...@@ -25,7 +25,7 @@ FMPSettings::~FMPSettings()
if (d_ptr) { if (d_ptr) {
delete d_ptr; delete d_ptr;
d_ptr = nullptr; d_ptr = 0;
} }
} }
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
#define FMP_SETTINGS_H #define FMP_SETTINGS_H
#include "fmp_settings_i.h" #include "fmp_settings_i.h"
#include "ui./window.h" #include "ui/window.h"
class FMPSettingsPrivate; class FMPSettingsPrivate;
......
...@@ -24,8 +24,14 @@ unix { ...@@ -24,8 +24,14 @@ unix {
#Target name #Target name
VER = $$system($$PWD/../fmprc.bat $$TARGET) VER = $$system($$PWD/../fmprc.bat $$TARGET)
ORIGIN_TARGET = $$TARGET ORIGIN_TARGET = $$TARGET
TARGET = $${TARGET}_$${VER} win32{
TARGET = $${TARGET}_$${VER}
}
else{
TARGET = $${TARGET}
}
#Header path #Header path
INCLUDEPATH += $$PWD/../include/ctk \ INCLUDEPATH += $$PWD/../include/ctk \
...@@ -37,7 +43,11 @@ LIBS += -L$$PWD/../lib ...@@ -37,7 +43,11 @@ LIBS += -L$$PWD/../lib
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
#Linking library #Linking library
win32 {
LIBS += -lCTKCored -lCTKPluginFrameworkd LIBS += -lCTKCored -lCTKPluginFrameworkd
}else{
LIBS += -lCTKCore -lCTKPluginFramework
}
#Destination path #Destination path
DESTDIR = $$PWD/../debug/plugins DESTDIR = $$PWD/../debug/plugins
} else { } else {
......
#include <QLineEdit> #include <QLineEdit>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <qDebug> #include <QDebug>
#include <QScrollBar> #include <QScrollBar>
#include <QPropertyAnimation> #include <QPropertyAnimation>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#define VER_MAJOR 0 #define VER_MAJOR 0
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 1 #define VER_REVISION 0
#define VER_BUILD 12 #define VER_BUILD 14
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment