diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-04-19 22:30:43 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-04-19 22:30:43 -0400 |
| commit | 094918f048c81474b22f9ba2940c96dc4033d753 (patch) | |
| tree | 2b89c77ad7dc9c55e9ba383f23f9f25b82df358e /SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro | |
| parent | 640fff60ceecde402131937dddb3458f7a003e9c (diff) | |
| parent | a308f430f694423064ebc86fd0506c8c6fdb3d93 (diff) | |
Merge tag 'upstream/3.0.5'
Upstream version 3.0.5
# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro index 0a7eb60..e21ee8b 100644 --- a/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro +++ b/SQLiteStudio3/coreSQLiteStudio/coreSQLiteStudio.pro @@ -217,7 +217,10 @@ SOURCES += sqlitestudio.cpp \ rsa/PrimeGenerator.cpp \ rsa/RSA.cpp \ translations.cpp \ - common/signalwait.cpp + common/signalwait.cpp \ + common/blockingsocket.cpp \ + common/threadwitheventloop.cpp \ + common/private/blockingsocketprivate.cpp HEADERS += sqlitestudio.h\ coreSQLiteStudio_global.h \ @@ -405,7 +408,11 @@ HEADERS += sqlitestudio.h\ rsa/PrimeGenerator.h \ rsa/RSA.h \ translations.h \ - common/signalwait.h + common/signalwait.h \ + common/blockingsocket.h \ + common/threadwitheventloop.h \ + common/private/blockingsocketprivate.h \ + common/expiringcache.h unix: { target.path = $$LIBDIR |