This commit is contained in:
Nissim Hadar 2017-11-12 11:27:24 -08:00
parent 7a0d188149
commit eaa51ebe9d
9 changed files with 19 additions and 7 deletions

View file

@ -1,13 +1,25 @@
set(TARGET_NAME auto-tester)
setup_hifi_project(Widgets)
link_hifi_libraries()
# grab the ui files in ui
file (GLOB_RECURSE QT_UI_FILES src/ui/*.ui)
# grab the implementation and header files from src dirs
file(GLOB_RECURSE INTERFACE_SRCS "src/*.cpp" "src/*.h")
GroupSources("src")
find_package(
Qt5 COMPONENTS
Gui Multimedia Network OpenGL Qml Quick Script Svg
${PLATFORM_QT_COMPONENTS}
WebChannel WebSockets
)
# grab the ui files in resources/ui
file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
source_group("UI Files" FILES ${QT_UI_FILES})
# have qt5 wrap them and generate the appropriate header files
qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
# add them to the interface source files
##set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}")
set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")

View file

@ -16,7 +16,7 @@
#include <QMessagebox>
#include <QRegularExpression>
#include "MismatchWindow.h"
#include "ui/MismatchWindow.h"
class Test {
public:

View file

@ -8,7 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QtWidgets/QApplication>
#include "autoTester.h"
#include "ui/autoTester.h"
int main(int argc, char *argv[])
{

View file

@ -12,7 +12,7 @@
#include "ui_MismatchWindow.h"
#include "common.h"
#include "../common.h"
class MismatchWindow : public QDialog, public Ui::MismatchWindow
{

View file

@ -13,7 +13,7 @@
#include <QtWidgets/QMainWindow>
#include "ui_autoTester.h"
#include "Test.h"
#include "../Test.h"
class AutoTester : public QMainWindow
{