Commit 2814e15916e1227be75f2f9f294aa8218d1e768c

Authored by Eric Menezes Noronha
1 parent ce93e130
Exists in master

merge

cacicD/cacicD.pro
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 QT += core 7 QT += core
8 QT -= gui 8 QT -= gui
9 QT += network 9 QT += network
  10 +QT += axcontainer
10 TARGET = cacicD 11 TARGET = cacicD
11 CONFIG += console 12 CONFIG += console
12 CONFIG -= app_bundle 13 CONFIG -= app_bundle
@@ -22,13 +23,15 @@ SOURCES += main.cpp \ @@ -22,13 +23,15 @@ SOURCES += main.cpp \
22 ../src/ccacic.cpp \ 23 ../src/ccacic.cpp \
23 cacicd.cpp \ 24 cacicd.cpp \
24 ../src/cacic_computer.cpp \ 25 ../src/cacic_computer.cpp \
25 - ../src/operatingsystem.cpp 26 + ../src/operatingsystem.cpp \
  27 + ../src/wmi.cpp \
26 28
27 HEADERS += \ 29 HEADERS += \
28 ../src/ccacic.h \ 30 ../src/ccacic.h \
29 cacicd.h \ 31 cacicd.h \
30 ../src/cacic_computer.h \ 32 ../src/cacic_computer.h \
31 ../src/operatingsystem.h 33 ../src/operatingsystem.h
  34 + ../src/wmi.h \
32 35
33 include(../src/qtservice/src/qtservice.pri) 36 include(../src/qtservice/src/qtservice.pri)
34 37
cacicD/cacicd.cpp
@@ -5,6 +5,7 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, @@ -5,6 +5,7 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv,
5 try{ 5 try{
6 setServiceDescription("Cacic Daemon"); 6 setServiceDescription("Cacic Daemon");
7 setServiceFlags(QtService::Default); 7 setServiceFlags(QtService::Default);
  8 + setStartupType(QtServiceController::AutoStartup);
8 } catch (...){ 9 } catch (...){
9 qCritical() << "Error desconhecido no construtor."; 10 qCritical() << "Error desconhecido no construtor.";
10 } 11 }
install-cacic/install-cacic.pro
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 QT += core 7 QT += core
8 QT += network 8 QT += network
9 QT -= gui 9 QT -= gui
  10 +QT += axcontainer
10 11
11 TARGET = install-cacic 12 TARGET = install-cacic
12 CONFIG += console 13 CONFIG += console
@@ -25,14 +26,16 @@ SOURCES += main.cpp \ @@ -25,14 +26,16 @@ SOURCES += main.cpp \
25 installcacic.cpp \ 26 installcacic.cpp \
26 ../src/ccacic.cpp \ 27 ../src/ccacic.cpp \
27 ../src/cacic_computer.cpp \ 28 ../src/cacic_computer.cpp \
28 - ../src/operatingsystem.cpp 29 + ../src/operatingsystem.cpp \
  30 + ../src/wmi.cpp
29 31
30 HEADERS += \ 32 HEADERS += \
31 installcacic.h \ 33 installcacic.h \
32 ../src/ccacic.h \ 34 ../src/ccacic.h \
33 ../src/cacic_computer.h \ 35 ../src/cacic_computer.h \
34 ../src/cacic_comm.h \ 36 ../src/cacic_comm.h \
35 - ../src/operatingsystem.h 37 + ../src/operatingsystem.h \
  38 + ../src/wmi.h
36 39
37 INCLUDEPATH += ../src \ 40 INCLUDEPATH += ../src \
38 ../src/crypto++/include/ 41 ../src/crypto++/include/
install-cacic/install-cacic.pro.user
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject> 2 <!DOCTYPE QtCreatorProject>
3 -<!-- Written by QtCreator 3.1.2, 2014-09-01T17:24:48. --> 3 +<!-- Written by QtCreator 3.1.2, 2014-09-05T15:10:53. -->
4 <qtcreator> 4 <qtcreator>
5 <data> 5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable> 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>