Download as
Browse Code »

Commit 489423c0e8b036b3511600e9769c7a905993ba66

Authored by Eric Menezes Noronha
1 parent 33066d0d
Exists in master

merge

Showing 3 changed files with 4 additions and 5 deletions   Show diff stats
cacic-daemon/cacicD/cacicD.pro
  Diff comments   View file @489423c
... ... @@ -25,7 +25,7 @@ SOURCES += main.cpp \
25 25 ../../src/wmi.cpp \
26 26 cacictimer.cpp \
27 27 ../../src/cacic_computer.cpp \
28   - ../../src/operatingsystem.cpp
  28 + ../../src/operatingsystem.cpp \
29 29  
30 30 HEADERS += \
31 31 ../../src/ccacic.h \
... ... @@ -34,7 +34,7 @@ HEADERS += \
34 34 ../../src/wmi.h \
35 35 ../../src/cacic_computer.h \
36 36 ../../src/operatingsystem.h \
37   - ../../src/cacic_comm.h
  37 + ../../src/cacic_comm.h \
38 38  
39 39 include(../../src/qtservice/src/qtservice.pri)
40 40  
... ...
cacic-daemon/cacicD/cacicD.pro.user
  Diff comments   View file @489423c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3   -<!-- Written by QtCreator 3.1.2, 2014-09-08T15:51:54. -->
  3 +<!-- Written by QtCreator 3.1.2, 2014-09-08T18:34:03. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
... ...
gercols/gercols.cpp
  Diff comments   View file @489423c
... ... @@ -19,12 +19,11 @@ Gercols::Gercols(QObject *parent)
19 19 configTeste["hardware"] = QJsonValue::fromVariant(QString(""));
20 20 configTeste["software"] = QJsonValue::fromVariant(QString(""));
21 21  
  22 + oColeta = new CColeta();
22 23 oCacic.setJsonToFile(configTeste,"configReq.json");
23 24 //Pega chave do registro, que será pega na instalação.
24 25 oCacic.setChaveCrypt(oCacic.getValueFromRegistry("Lightbase", "Cacic", "key").toString());
25 26  
26   - oColeta = new CColeta();
27   -
28 27 QObject::connect(this, SIGNAL(iniciaConfiguracao()), oColeta, SLOT(configuraColetas()));
29 28 QObject::connect(this, SIGNAL(iniciaColeta()), oColeta, SLOT(run()));
30 29  
... ...