Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 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>"

1 files changed, 23 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/signalwait.h b/SQLiteStudio3/coreSQLiteStudio/common/signalwait.h
new file mode 100644
index 0000000..7b7b903
--- /dev/null
+++ b/SQLiteStudio3/coreSQLiteStudio/common/signalwait.h
@@ -0,0 +1,23 @@
+#ifndef SIGNALWAIT_H
+#define SIGNALWAIT_H
+
+#include <QObject>
+
+class SignalWait : public QObject
+{
+        Q_OBJECT
+
+    public:
+        SignalWait(QObject *object, const char *signal);
+
+        bool wait(int msTimeout);
+        void reset();
+
+    private:
+        bool called = false;
+
+    private slots:
+        void handleSignal();
+};
+
+#endif // SIGNALWAIT_H