Commit add021b7 by xiaojing.zhang

googleTest dll 路径修改

parent 8debc885
...@@ -3,7 +3,7 @@ isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR) ...@@ -3,7 +3,7 @@ isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
isEmpty(GOOGLETEST_DIR) { isEmpty(GOOGLETEST_DIR) {
warning("Using googletest src dir specified at Qt Creator wizard") warning("Using googletest src dir specified at Qt Creator wizard")
message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message") message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
GOOGLETEST_DIR = E:/Code/googletest GOOGLETEST_DIR = E:/googletest
} }
!isEmpty(GOOGLETEST_DIR): { !isEmpty(GOOGLETEST_DIR): {
......
...@@ -38,6 +38,7 @@ class FooEnvironment: public testing::Environment ...@@ -38,6 +38,7 @@ class FooEnvironment: public testing::Environment
virtual void SetUp() virtual void SetUp()
{ {
//独立加载set模块 //独立加载set模块
QString path = qApp->applicationDirPath();
QSettings *_setting = new QSettings(qApp->applicationDirPath()+ "/"+"FreemudPOS.ini", QSettings::IniFormat); QSettings *_setting = new QSettings(qApp->applicationDirPath()+ "/"+"FreemudPOS.ini", QSettings::IniFormat);
QString _plugin_path = _setting->value(FMP_INIKEY_PLUGINPATH, "plugins").toString(); QString _plugin_path = _setting->value(FMP_INIKEY_PLUGINPATH, "plugins").toString();
QString _entry_plugin = _setting->value(FMP_INIKEY_ENTRYSERVICE, "com.fmp.home").toString(); QString _entry_plugin = _setting->value(FMP_INIKEY_ENTRYSERVICE, "com.fmp.home").toString();
...@@ -45,7 +46,7 @@ class FooEnvironment: public testing::Environment ...@@ -45,7 +46,7 @@ class FooEnvironment: public testing::Environment
props[FMP_PROPKEY_PLUGINPATH] = _plugin_path; props[FMP_PROPKEY_PLUGINPATH] = _plugin_path;
props[FMP_PROPKEY_ENTRY] = _entry_plugin; props[FMP_PROPKEY_ENTRY] = _entry_plugin;
props[FMP_PROPKEY_CFG] = _setting->fileName(); props[FMP_PROPKEY_CFG] = _setting->fileName();
QString dir = "D:/newTest/debug/plugins/fmp_settings_0.1.0.dll"; QString dir = path.mid(0,path.length()-5)+"/plugins/fmp_settings_0.1.0.dll";
QUrl url = QUrl::fromLocalFile(dir); QUrl url = QUrl::fromLocalFile(dir);
QSharedPointer<ctkPlugin> plugin; QSharedPointer<ctkPlugin> plugin;
ctkPluginContext *_ctx; ctkPluginContext *_ctx;
......
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