From 2814e15916e1227be75f2f9f294aa8218d1e768c Mon Sep 17 00:00:00 2001
From: ericmenezesn@gmail.com <ericmenezesn@gmail.com>
Date: Mon, 8 Sep 2014 15:47:34 -0300
Subject: [PATCH] merge

---
 cacicD/cacicD.pro                    | 5 ++++-
 cacicD/cacicd.cpp                    | 1 +
 install-cacic/install-cacic.pro      | 7 +++++--
 install-cacic/install-cacic.pro.user | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cacicD/cacicD.pro b/cacicD/cacicD.pro
index 9295d4c..76f92de 100644
--- a/cacicD/cacicD.pro
+++ b/cacicD/cacicD.pro
@@ -7,6 +7,7 @@
 QT       += core
 QT       -= gui
 QT       += network
+QT       += axcontainer
 TARGET = cacicD
 CONFIG   += console
 CONFIG   -= app_bundle
@@ -22,13 +23,15 @@ SOURCES += main.cpp \
     ../src/ccacic.cpp \
     cacicd.cpp \
     ../src/cacic_computer.cpp \
-    ../src/operatingsystem.cpp
+    ../src/operatingsystem.cpp \
+    ../src/wmi.cpp \
 
 HEADERS += \
     ../src/ccacic.h \
     cacicd.h \
     ../src/cacic_computer.h \
     ../src/operatingsystem.h
+    ../src/wmi.h \
 
 include(../src/qtservice/src/qtservice.pri)
 
diff --git a/cacicD/cacicd.cpp b/cacicD/cacicd.cpp
index 1302f49..0fae85b 100644
--- a/cacicD/cacicd.cpp
+++ b/cacicD/cacicd.cpp
@@ -5,6 +5,7 @@ cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, 
     try{
         setServiceDescription("Cacic Daemon");
         setServiceFlags(QtService::Default);
+        setStartupType(QtServiceController::AutoStartup);
     } catch (...){
         qCritical() << "Error desconhecido no construtor.";
     }
diff --git a/install-cacic/install-cacic.pro b/install-cacic/install-cacic.pro
index 2c724aa..9b617aa 100644
--- a/install-cacic/install-cacic.pro
+++ b/install-cacic/install-cacic.pro
@@ -7,6 +7,7 @@
 QT += core
 QT += network
 QT -= gui
+QT += axcontainer
 
 TARGET = install-cacic
 CONFIG += console
@@ -25,14 +26,16 @@ SOURCES += main.cpp \
     installcacic.cpp \
     ../src/ccacic.cpp \
     ../src/cacic_computer.cpp \
-    ../src/operatingsystem.cpp
+    ../src/operatingsystem.cpp \
+    ../src/wmi.cpp
 
 HEADERS += \
     installcacic.h \
     ../src/ccacic.h \
     ../src/cacic_computer.h \
     ../src/cacic_comm.h \
-    ../src/operatingsystem.h
+    ../src/operatingsystem.h \
+    ../src/wmi.h
 
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
diff --git a/install-cacic/install-cacic.pro.user b/install-cacic/install-cacic.pro.user
index 20aa34c..6dd75dc 100644
--- a/install-cacic/install-cacic.pro.user
+++ b/install-cacic/install-cacic.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-09-01T17:24:48. -->
+<!-- Written by QtCreator 3.1.2, 2014-09-05T15:10:53. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
--
libgit2 0.21.2