Skip to content

Commit 9c0cd6e

Browse files
BrettRylandBrettRyland
committed
OpenCL version
The Qt version now has the integrator implemented in OpenCL using boost.compute with the resulting values being directly copied to the vertex buffer of the OpenGL widget. Performance is significantly improved to the point where a 1,000,000 element simulation with 3 stages in x and y can run in real time.
1 parent 2d99345 commit 9c0cd6e

31 files changed

+4384
-552
lines changed

‎Qt/QtWaves/GeneratedFiles/qrc_qtwaves.cpp

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static const unsigned char qt_resource_data[] = {
4848
0x20,0x20,0x20,0x66,0x72,0x61,0x67,0x5f,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,
4949
0x20,0x3d,0x20,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x3b,0xd,0xa,0x7d,
5050
// D:/bnryl/Programming/main-repo/projects/Waves/Qt/QtWaves/shaders/surface.frag.glsl
51-
0x0,0x0,0x3,0xec,
51+
0x0,0x0,0x4,0x9,
5252
0x23,
5353
0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0xa,0xa,0x75,0x6e,0x69,
5454
0x66,0x6f,0x72,0x6d,0x20,0x6d,0x61,0x74,0x34,0x20,0x6d,0x6f,0x64,0x65,0x6c,0x76,
@@ -63,7 +63,7 @@ static const unsigned char qt_resource_data[] = {
6363
0x65,0x28,0x76,0x65,0x63,0x33,0x28,0x32,0x2c,0x20,0x31,0x2c,0x20,0x2d,0x34,0x29,
6464
0x29,0x3b,0xa,0x63,0x6f,0x6e,0x73,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x6c,0x69,
6565
0x67,0x68,0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x20,0x3d,0x20,0x76,0x65,
66-
0x63,0x34,0x28,0x30,0x2e,0x33,0x2c,0x20,0x30,0x2e,0x33,0x2c,0x20,0x30,0x2e,0x33,
66+
0x63,0x34,0x28,0x30,0x2e,0x38,0x2c,0x20,0x30,0x2e,0x38,0x2c,0x20,0x30,0x2e,0x38,
6767
0x2c,0x20,0x30,0x2e,0x30,0x29,0x3b,0xa,0x63,0x6f,0x6e,0x73,0x74,0x20,0x76,0x65,
6868
0x63,0x34,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x61,0x6d,0x62,0x69,0x65,0x6e,0x74,
6969
0x20,0x3d,0x20,0x76,0x65,0x63,0x34,0x28,0x30,0x2e,0x31,0x2c,0x20,0x30,0x2e,0x31,
@@ -91,28 +91,30 @@ static const unsigned char qt_resource_data[] = {
9191
0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x2c,0x20,0x6d,0x76,0x5f,0x6c,0x69,0x67,0x68,0x74,
9292
0x5f,0x64,0x69,0x72,0x65,0x63,0x74,0x69,0x6f,0x6e,0x29,0x2c,0x20,0x30,0x2e,0x30,
9393
0x29,0x20,0x2a,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,
94-
0x65,0x3b,0xa,0x20,0x20,0x20,0x20,0x76,0x65,0x63,0x34,0x20,0x61,0x6d,0x62,0x69,
95-
0x65,0x6e,0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x5f,0x66,0x61,0x63,0x74,
96-
0x6f,0x72,0x20,0x3d,0x20,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x5f,0x66,0x61,0x63,
97-
0x74,0x6f,0x72,0x20,0x2b,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x61,0x6d,0x62,0x69,
98-
0x65,0x6e,0x74,0x3b,0xa,0x20,0x20,0x20,0x20,0x76,0x65,0x63,0x34,0x20,0x73,0x70,
99-
0x65,0x63,0x75,0x6c,0x61,0x72,0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,0x20,0x3d,0x20,
100-
0x6d,0x61,0x78,0x28,0x70,0x6f,0x77,0x28,0x2d,0x64,0x6f,0x74,0x28,0x72,0x65,0x66,
101-
0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x2c,0x20,0x65,0x79,0x65,0x29,0x2c,0x20,0x66,
102-
0x72,0x61,0x67,0x5f,0x73,0x68,0x69,0x6e,0x69,0x6e,0x65,0x73,0x73,0x29,0x2c,0x20,
103-
0x30,0x2e,0x30,0x29,0x20,0x2a,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x73,0x70,0x65,
104-
0x63,0x75,0x6c,0x61,0x72,0x3b,0xa,0x20,0x20,0x20,0x20,0x2f,0x2f,0x76,0x65,0x63,
105-
0x34,0x20,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x5f,0x66,0x61,0x63,0x74,0x6f,
106-
0x72,0x20,0x3d,0x20,0x6d,0x61,0x78,0x28,0x70,0x6f,0x77,0x28,0x2d,0x64,0x6f,0x74,
107-
0x28,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x2c,0x20,0x65,0x79,0x65,0x29,0x2c,0x20,0x66,
108-
0x72,0x61,0x67,0x5f,0x73,0x68,0x69,0x6e,0x69,0x6e,0x65,0x73,0x73,0x29,0x2c,0x20,
109-
0x30,0x2e,0x30,0x29,0x20,0x2a,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x73,0x70,0x65,
110-
0x63,0x75,0x6c,0x61,0x72,0x3b,0xa,0x20,0x20,0x20,0x20,0xa,0x20,0x20,0x20,0x20,
111-
0x67,0x6c,0x5f,0x46,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20,0x73,
112-
0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,0x20,0x2a,
113-
0x20,0x66,0x72,0x61,0x67,0x5f,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x20,0x2b,
114-
0x20,0x61,0x6d,0x62,0x69,0x65,0x6e,0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,
115-
0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,0x3b,0xa,0x7d,0xa,
94+
0x65,0x3b,0xa,0x9,0x76,0x65,0x63,0x34,0x20,0x66,0x72,0x61,0x67,0x5f,0x64,0x69,
95+
0x66,0x66,0x75,0x73,0x65,0x20,0x3d,0x20,0x76,0x65,0x63,0x34,0x28,0x66,0x72,0x61,
96+
0x67,0x5f,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x2e,0x78,0x79,0x7a,0x2c,0x20,
97+
0x30,0x2e,0x30,0x29,0x3b,0x20,0x2f,0x2f,0x20,0x75,0x73,0x65,0x20,0x74,0x68,0x65,
98+
0x20,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x20,0x63,0x6f,0x6d,0x70,0x6f,0x6e,
99+
0x65,0x6e,0x74,0x20,0x61,0x73,0x20,0x74,0x68,0x65,0x20,0x64,0x69,0x66,0x66,0x75,
100+
0x73,0x65,0x20,0x63,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x20,0x74,0x6f,0x6f,
101+
0xa,0x20,0x20,0x20,0x20,0x76,0x65,0x63,0x34,0x20,0x61,0x6d,0x62,0x69,0x65,0x6e,
102+
0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,
103+
0x20,0x3d,0x20,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x5f,0x66,0x61,0x63,0x74,0x6f,
104+
0x72,0x20,0x2a,0x20,0x66,0x72,0x61,0x67,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,
105+
0x20,0x2b,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x61,0x6d,0x62,0x69,0x65,0x6e,0x74,
106+
0x3b,0xa,0x20,0x20,0x20,0x20,0x76,0x65,0x63,0x34,0x20,0x73,0x70,0x65,0x63,0x75,
107+
0x6c,0x61,0x72,0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,0x20,0x3d,0x20,0x6d,0x61,0x78,
108+
0x28,0x70,0x6f,0x77,0x28,0x2d,0x64,0x6f,0x74,0x28,0x72,0x65,0x66,0x6c,0x65,0x63,
109+
0x74,0x69,0x6f,0x6e,0x2c,0x20,0x65,0x79,0x65,0x29,0x2c,0x20,0x66,0x72,0x61,0x67,
110+
0x5f,0x73,0x68,0x69,0x6e,0x69,0x6e,0x65,0x73,0x73,0x29,0x2c,0x20,0x30,0x2e,0x30,
111+
0x29,0x20,0x2a,0x20,0x6c,0x69,0x67,0x68,0x74,0x5f,0x73,0x70,0x65,0x63,0x75,0x6c,
112+
0x61,0x72,0x3b,0xa,0x20,0x20,0x20,0x20,0xa,0x20,0x20,0x20,0x20,0x67,0x6c,0x5f,
113+
0x46,0x72,0x61,0x67,0x43,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20,0x73,0x70,0x65,0x63,
114+
0x75,0x6c,0x61,0x72,0x5f,0x66,0x61,0x63,0x74,0x6f,0x72,0x20,0x2a,0x20,0x66,0x72,
115+
0x61,0x67,0x5f,0x73,0x70,0x65,0x63,0x75,0x6c,0x61,0x72,0x20,0x2b,0x20,0x61,0x6d,
116+
0x62,0x69,0x65,0x6e,0x74,0x5f,0x64,0x69,0x66,0x66,0x75,0x73,0x65,0x5f,0x66,0x61,
117+
0x63,0x74,0x6f,0x72,0x3b,0xa,0x7d,0xa,
116118

117119
};
118120

@@ -154,10 +156,10 @@ static const unsigned char qt_resource_struct[] = {
154156
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
155157
// :/QtWaves/shaders/surface.vert.glsl
156158
0x0,0x0,0x0,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
157-
0x0,0x0,0x1,0x5b,0xaf,0x7d,0x63,0xfe,
159+
0x0,0x0,0x1,0x5d,0xc2,0x6c,0x7c,0x4b,
158160
// :/QtWaves/shaders/surface.frag.glsl
159161
0x0,0x0,0x0,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x54,
160-
0x0,0x0,0x1,0x5b,0xb4,0x1e,0xcd,0x41,
162+
0x0,0x0,0x1,0x5d,0xc2,0x6c,0x82,0xd7,
161163

162164
};
163165

‎Qt/QtWaves/GeneratedFiles/ui_mainwindow.h

Lines changed: 106 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
#include <QtWidgets/QAction>
1414
#include <QtWidgets/QApplication>
1515
#include <QtWidgets/QButtonGroup>
16+
#include <QtWidgets/QComboBox>
17+
#include <QtWidgets/QDoubleSpinBox>
1618
#include <QtWidgets/QHBoxLayout>
1719
#include <QtWidgets/QHeaderView>
20+
#include <QtWidgets/QLineEdit>
1821
#include <QtWidgets/QMainWindow>
1922
#include <QtWidgets/QPushButton>
2023
#include <QtWidgets/QSpacerItem>
@@ -32,21 +35,24 @@ class Ui_mainwindowClass
3235
QHBoxLayout *horizontalLayout;
3336
OGLWidget *openGLWidget;
3437
QVBoxLayout *verticalLayout;
35-
QPushButton *ICButton;
36-
QPushButton *BCButton;
37-
QPushButton *pauseButton;
38-
QPushButton *fullscreenButton;
39-
QPushButton *resetviewButton;
38+
QComboBox *IC_comboBox;
39+
QComboBox *BC_comboBox;
40+
QPushButton *pause_Button;
41+
QDoubleSpinBox *timestep_doubleSpinBox;
42+
QLineEdit *time_lineEdit;
43+
QDoubleSpinBox *dissipation_doubleSpinBox;
44+
QPushButton *fullscreen_Button;
45+
QPushButton *reset_view_Button;
4046
QSpacerItem *verticalSpacer;
41-
QPushButton *quitButton;
47+
QPushButton *quit_Button;
4248
QToolBar *mainToolBar;
4349

4450
void setupUi(QMainWindow *Waves__mainwindowClass)
4551
{
4652
if (Waves__mainwindowClass->objectName().isEmpty())
4753
Waves__mainwindowClass->setObjectName(QStringLiteral("Waves__mainwindowClass"));
4854
Waves__mainwindowClass->setWindowModality(Qt::ApplicationModal);
49-
Waves__mainwindowClass->resize(930, 632);
55+
Waves__mainwindowClass->resize(1024, 600);
5056
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
5157
sizePolicy.setHorizontalStretch(1);
5258
sizePolicy.setVerticalStretch(1);
@@ -74,39 +80,66 @@ class Ui_mainwindowClass
7480
verticalLayout = new QVBoxLayout();
7581
verticalLayout->setSpacing(6);
7682
verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
77-
ICButton = new QPushButton(centralWidget);
78-
ICButton->setObjectName(QStringLiteral("ICButton"));
83+
IC_comboBox = new QComboBox(centralWidget);
84+
IC_comboBox->setObjectName(QStringLiteral("IC_comboBox"));
7985

80-
verticalLayout->addWidget(ICButton);
86+
verticalLayout->addWidget(IC_comboBox);
8187

82-
BCButton = new QPushButton(centralWidget);
83-
BCButton->setObjectName(QStringLiteral("BCButton"));
88+
BC_comboBox = new QComboBox(centralWidget);
89+
BC_comboBox->setObjectName(QStringLiteral("BC_comboBox"));
8490

85-
verticalLayout->addWidget(BCButton);
91+
verticalLayout->addWidget(BC_comboBox);
8692

87-
pauseButton = new QPushButton(centralWidget);
88-
pauseButton->setObjectName(QStringLiteral("pauseButton"));
93+
pause_Button = new QPushButton(centralWidget);
94+
pause_Button->setObjectName(QStringLiteral("pause_Button"));
8995

90-
verticalLayout->addWidget(pauseButton);
96+
verticalLayout->addWidget(pause_Button);
9197

92-
fullscreenButton = new QPushButton(centralWidget);
93-
fullscreenButton->setObjectName(QStringLiteral("fullscreenButton"));
98+
timestep_doubleSpinBox = new QDoubleSpinBox(centralWidget);
99+
timestep_doubleSpinBox->setObjectName(QStringLiteral("timestep_doubleSpinBox"));
100+
timestep_doubleSpinBox->setAlignment(Qt::AlignCenter);
101+
timestep_doubleSpinBox->setDecimals(4);
102+
timestep_doubleSpinBox->setMinimum(0);
103+
timestep_doubleSpinBox->setMaximum(0.1);
104+
timestep_doubleSpinBox->setSingleStep(0.0001);
105+
timestep_doubleSpinBox->setValue(0.0167);
94106

95-
verticalLayout->addWidget(fullscreenButton);
107+
verticalLayout->addWidget(timestep_doubleSpinBox);
96108

97-
resetviewButton = new QPushButton(centralWidget);
98-
resetviewButton->setObjectName(QStringLiteral("resetviewButton"));
109+
time_lineEdit = new QLineEdit(centralWidget);
110+
time_lineEdit->setObjectName(QStringLiteral("time_lineEdit"));
111+
time_lineEdit->setAlignment(Qt::AlignCenter);
112+
time_lineEdit->setReadOnly(true);
99113

100-
verticalLayout->addWidget(resetviewButton);
114+
verticalLayout->addWidget(time_lineEdit);
115+
116+
dissipation_doubleSpinBox = new QDoubleSpinBox(centralWidget);
117+
dissipation_doubleSpinBox->setObjectName(QStringLiteral("dissipation_doubleSpinBox"));
118+
dissipation_doubleSpinBox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
119+
dissipation_doubleSpinBox->setDecimals(3);
120+
dissipation_doubleSpinBox->setMaximum(1);
121+
dissipation_doubleSpinBox->setSingleStep(0.001);
122+
123+
verticalLayout->addWidget(dissipation_doubleSpinBox);
124+
125+
fullscreen_Button = new QPushButton(centralWidget);
126+
fullscreen_Button->setObjectName(QStringLiteral("fullscreen_Button"));
127+
128+
verticalLayout->addWidget(fullscreen_Button);
129+
130+
reset_view_Button = new QPushButton(centralWidget);
131+
reset_view_Button->setObjectName(QStringLiteral("reset_view_Button"));
132+
133+
verticalLayout->addWidget(reset_view_Button);
101134

102135
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
103136

104137
verticalLayout->addItem(verticalSpacer);
105138

106-
quitButton = new QPushButton(centralWidget);
107-
quitButton->setObjectName(QStringLiteral("quitButton"));
139+
quit_Button = new QPushButton(centralWidget);
140+
quit_Button->setObjectName(QStringLiteral("quit_Button"));
108141

109-
verticalLayout->addWidget(quitButton);
142+
verticalLayout->addWidget(quit_Button);
110143

111144

112145
horizontalLayout->addLayout(verticalLayout);
@@ -118,18 +151,60 @@ class Ui_mainwindowClass
118151

119152
retranslateUi(Waves__mainwindowClass);
120153

154+
IC_comboBox->setCurrentIndex(0);
155+
BC_comboBox->setCurrentIndex(0);
156+
157+
121158
QMetaObject::connectSlotsByName(Waves__mainwindowClass);
122159
} // setupUi
123160

124161
void retranslateUi(QMainWindow *Waves__mainwindowClass)
125162
{
126163
Waves__mainwindowClass->setWindowTitle(QApplication::translate("Waves::mainwindowClass", "QtGL", Q_NULLPTR));
127-
ICButton->setText(QApplication::translate("Waves::mainwindowClass", "Initial Condition", Q_NULLPTR));
128-
BCButton->setText(QApplication::translate("Waves::mainwindowClass", "Boundary Condition", Q_NULLPTR));
129-
pauseButton->setText(QApplication::translate("Waves::mainwindowClass", "Pause", Q_NULLPTR));
130-
fullscreenButton->setText(QApplication::translate("Waves::mainwindowClass", "Fullscreen", Q_NULLPTR));
131-
resetviewButton->setText(QApplication::translate("Waves::mainwindowClass", "Reset view", Q_NULLPTR));
132-
quitButton->setText(QApplication::translate("Waves::mainwindowClass", "Quit", Q_NULLPTR));
164+
IC_comboBox->clear();
165+
IC_comboBox->insertItems(0, QStringList()
166+
<< QApplication::translate("Waves::mainwindowClass", "Single frequency", Q_NULLPTR)
167+
<< QApplication::translate("Waves::mainwindowClass", "Continuous spectrum", Q_NULLPTR)
168+
<< QApplication::translate("Waves::mainwindowClass", "Localised hump", Q_NULLPTR)
169+
<< QApplication::translate("Waves::mainwindowClass", "Two localised humps", Q_NULLPTR)
170+
<< QApplication::translate("Waves::mainwindowClass", "Off-centre localised hump", Q_NULLPTR)
171+
<< QApplication::translate("Waves::mainwindowClass", "A localised wave", Q_NULLPTR)
172+
);
173+
#ifndef QT_NO_TOOLTIP
174+
IC_comboBox->setToolTip(QApplication::translate("Waves::mainwindowClass", "Initial conditions", Q_NULLPTR));
175+
#endif // QT_NO_TOOLTIP
176+
#ifndef QT_NO_STATUSTIP
177+
IC_comboBox->setStatusTip(QString());
178+
#endif // QT_NO_STATUSTIP
179+
#ifndef QT_NO_WHATSTHIS
180+
IC_comboBox->setWhatsThis(QApplication::translate("Waves::mainwindowClass", "Initial conditions", Q_NULLPTR));
181+
#endif // QT_NO_WHATSTHIS
182+
BC_comboBox->clear();
183+
BC_comboBox->insertItems(0, QStringList()
184+
<< QApplication::translate("Waves::mainwindowClass", "Periodic square", Q_NULLPTR)
185+
<< QApplication::translate("Waves::mainwindowClass", "Dirichlet, square", Q_NULLPTR)
186+
<< QApplication::translate("Waves::mainwindowClass", "Dirichlet, circle", Q_NULLPTR)
187+
<< QApplication::translate("Waves::mainwindowClass", "Dirichlet, circle with a cusp", Q_NULLPTR)
188+
<< QApplication::translate("Waves::mainwindowClass", "Dirichlet, intersecting circles", Q_NULLPTR)
189+
<< QApplication::translate("Waves::mainwindowClass", "Double slit (mixed BCs)", Q_NULLPTR)
190+
);
191+
#ifndef QT_NO_TOOLTIP
192+
BC_comboBox->setToolTip(QApplication::translate("Waves::mainwindowClass", "Boundary Conditions", Q_NULLPTR));
193+
#endif // QT_NO_TOOLTIP
194+
#ifndef QT_NO_WHATSTHIS
195+
BC_comboBox->setWhatsThis(QApplication::translate("Waves::mainwindowClass", "Boundary Conditions", Q_NULLPTR));
196+
#endif // QT_NO_WHATSTHIS
197+
pause_Button->setText(QApplication::translate("Waves::mainwindowClass", "Pause", Q_NULLPTR));
198+
timestep_doubleSpinBox->setPrefix(QApplication::translate("Waves::mainwindowClass", "Timestep: ", Q_NULLPTR));
199+
timestep_doubleSpinBox->setSuffix(QApplication::translate("Waves::mainwindowClass", "s", Q_NULLPTR));
200+
time_lineEdit->setPlaceholderText(QString());
201+
#ifndef QT_NO_TOOLTIP
202+
dissipation_doubleSpinBox->setToolTip(QApplication::translate("Waves::mainwindowClass", "Artificial dissipation", Q_NULLPTR));
203+
#endif // QT_NO_TOOLTIP
204+
dissipation_doubleSpinBox->setPrefix(QApplication::translate("Waves::mainwindowClass", "Dissipation factor: ", Q_NULLPTR));
205+
fullscreen_Button->setText(QApplication::translate("Waves::mainwindowClass", "Fullscreen", Q_NULLPTR));
206+
reset_view_Button->setText(QApplication::translate("Waves::mainwindowClass", "Reset view", Q_NULLPTR));
207+
quit_Button->setText(QApplication::translate("Waves::mainwindowClass", "Quit", Q_NULLPTR));
133208
} // retranslateUi
134209

135210
};

‎Qt/QtWaves/QtWaves.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
TEMPLATE = app
66
TARGET = QtWaves
7-
DESTDIR = ../../Win32/Release
87
QT += core widgets gui
98
CONFIG += release console
109
DEFINES += QT_DLL QT_WIDGETS_LIB
1110
INCLUDEPATH += ./GeneratedFiles \
1211
. \
1312
./GeneratedFiles/Release \
14-
$(ProjectDir)/include \
15-
$(ProjectDir)/../../include
13+
include \
14+
../../include \
15+
/home/brett/Programming/main-repo/include
1616
DEPENDPATH += .
1717
MOC_DIR += ./GeneratedFiles/release
1818
OBJECTS_DIR += release

0 commit comments

Comments
 (0)