Merge remote-tracking branch 'git.irl/master'
diff --git a/gui/ChronoShareGui.pro b/gui/ChronoShareGui.pro
deleted file mode 100644
index e2cad8e..0000000
--- a/gui/ChronoShareGui.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-01-17T18:25:59
-#
-#-------------------------------------------------
-
-QT += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = ChronoShareGui
-TEMPLATE = app
-
-
-SOURCES += main.cpp\
- chronosharegui.cpp
-
-HEADERS += chronosharegui.h
-
-FORMS += chronosharegui.ui
-
-RESOURCES += \
- images.qrc
diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index 6faa80b..f252370 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -19,7 +19,6 @@
*/
#include "chronosharegui.h"
-#include "ui_chronosharegui.h"
ChronoShareGui::ChronoShareGui(QWidget *parent) :
QWidget(parent),
@@ -96,7 +95,7 @@
// create the "quit program" action
m_quitProgram = new QAction(tr("&Quit"), this);
- connect(m_quitProgram, SIGNAL(triggered()), qApp, SLOT(quit()));
+ connect(m_quitProgram, SIGNAL(triggered()), this, SLOT(quit()));
}
@@ -218,3 +217,9 @@
qDebug() << "Close Event.";
event->ignore(); // don't let the event propagate to the base class
}
+
+#if WAF
+#include "chronosharegui.moc"
+#include "chronosharegui.cpp.moc"
+#endif
+
diff --git a/gui/chronosharegui.ui b/gui/chronosharegui.ui
deleted file mode 100644
index 685ec22..0000000
--- a/gui/chronosharegui.ui
+++ /dev/null
@@ -1,20 +0,0 @@
-<ui version="4.0">
- <class>ChronoShareGui</class>
- <widget class="QWidget" name="ChronoShareGui" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>ChronoShareGui</string>
- </property>
- </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <resources/>
- <connections/>
-</ui>
diff --git a/wscript b/wscript
index 7b62859..37c5678 100644
--- a/wscript
+++ b/wscript
@@ -103,3 +103,12 @@
includes = "filesystemwatcher . ",
use = "QTCORE QTGUI"
)
+
+ qt = bld (
+ target = "gui",
+ features = "qt4 cxx cxxprogram",
+ defines = "WAF",
+ source = bld.path.ant_glob(['gui/*.cpp']),
+ includes = "chronosharegui . ",
+ use = "QTCORE QTGUI"
+ )