status-im/dotherside
2
0
Fork 0
mirror of https://github.com/status-im/dotherside.git synced 2025-02-11 20:16:47 +00:00
Code Issues Projects Releases Wiki Activity

Enabled warning on CXX and fixed compilation on Qt 5.3

Browse Source
This commit is contained in:
Filippo Cucchetto 2016-01-29 22:27:55 +01:00
parent 812f80c577
commit 5290695477
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,3 +1,6 @@
cmake_minimum_required(VERSION 3.0)
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
endif()
add_subdirectory(lib)
add_subdirectory(test)

2
lib/src/DosQObjectImpl.cpp
View File

@ -54,6 +54,8 @@ int DosQObjectImpl::qt_metacall(QMetaObject::Call callType, int index, void **ar
case QMetaObject::WriteProperty:
writeProperty(index, args);
break;
default:
return -1;
}
return -1;

22
test/test_dotherside.cpp
View File

@ -48,10 +48,12 @@ private slots:
{
bool quit = false;
dos_qguiapplication_create();
QTimer::singleShot(100, [&quit]() {
QTimer timer;
QObject::connect(&timer, &QTimer::timeout, [&quit]() {
quit = true;
dos_qguiapplication_quit();
});
timer.start(100);
dos_qguiapplication_exec();
QVERIFY(quit);
dos_qguiapplication_delete();
@ -70,10 +72,12 @@ private slots:
{
bool quit = false;
dos_qapplication_create();
QTimer::singleShot(100, [&quit]() {
QTimer timer;
QObject::connect(&timer, &QTimer::timeout, [&quit]() {
quit = true;
dos_qapplication_quit();
});
timer.start(100);
dos_qapplication_exec();
QVERIFY(quit);
dos_qapplication_delete();
@ -303,13 +307,13 @@ private slots:
void *dPointer = nullptr;
RowCountCallback rcc;
ColumnCountCallback ccc;
DataCallback dc;
SetDataCallback sdc;
RoleNamesCallback rnc;
FlagsCallback fc;
HeaderDataCallback hdc;
RowCountCallback rcc = nullptr;
ColumnCountCallback ccc = nullptr;
DataCallback dc = nullptr;
SetDataCallback sdc = nullptr;
RoleNamesCallback rnc = nullptr;
FlagsCallback fc = nullptr;
HeaderDataCallback hdc = nullptr;
DosQAbstractListModel testObject(dPointer, moh->data(), ose, rcc, ccc, dc, sdc, rnc, fc, hdc);
testObject.setObjectName("testObject");