Mercurial > trustbridge
comparison ui/installwrapper.h @ 310:f758460ca437
Merged
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Fri, 04 Apr 2014 09:54:19 +0200 |
| parents | f23e0ccd5d14 |
| children | dc4efb0a70cb |
comparison
equal
deleted
inserted
replaced
| 309:fa37384b86b6 | 310:f758460ca437 |
|---|---|
| 1 #ifndef UI_INSTALLWRAPPER_H | 1 #ifndef UI_INSTALLWRAPPER_H |
| 2 #define UI_INSTALLWRAPPER_H | 2 #define UI_INSTALLWRAPPER_H |
| 3 | 3 |
| 4 #include <QString> | 4 #include <QString> |
| 5 #include <QStringList> | 5 #include <QStringList> |
| 6 #include <QProcess> | |
| 7 #include <QThread> | 6 #include <QThread> |
| 8 | 7 |
| 9 #include "certificate.h" | 8 #include "certificate.h" |
| 10 /** @file installwrapper.h | 9 /** @file installwrapper.h |
| 11 * @brief Wrapper around the call to the updated process */ | 10 * @brief Wrapper around the call to the updated process */ |
| 43 const QStringList& instructions); | 42 const QStringList& instructions); |
| 44 | 43 |
| 45 private: | 44 private: |
| 46 const QString mCertListFile; | 45 const QString mCertListFile; |
| 47 const QStringList mInstructions; | 46 const QStringList mInstructions; |
| 48 #ifdef WIN32 | |
| 49 SHELLEXECUTEINFOW mExecInfo; | |
| 50 #else | |
| 51 QProcess cinstProc; | |
| 52 #endif | |
| 53 | 47 |
| 54 protected: | 48 protected: |
| 55 void run(); | 49 void run(); |
| 56 | 50 |
| 57 Q_SIGNALS: | 51 Q_SIGNALS: |