fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00
parent cd1fdbbbc2
commit e4f86893a8
9 changed files with 164 additions and 152 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -266,7 +266,7 @@ IF(DEFINED MMC_KEYRING_TEST)
 # test.cpp
 ADD_EXECUTABLE(Test test.cpp)
 QT5_USE_MODULES(Test Core)
-TARGET_LINK_LIBRARIES(Test libmmcutil libmmcsettings)
+TARGET_LINK_LIBRARIES(Test libUtil libSettings)
 ENDIF()

 ################################ INSTALLATION AND PACKAGING ################################