Skip to content

Commit 82c29dd

Browse files
committed
Worked on warnings
1 parent 5d25a43 commit 82c29dd

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

src/contentwidget.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ along with longscroll-qt. If not see <http://www.gnu.org/licenses/>.
2323
#include "longscroll-qt_global.h"
2424
#include "notifyablescrollcontentwidget.h"
2525
#include "contentiteminfo.h"
26-
#include <QAbstractItemView>
2726

2827
LONGSCROLLQT_NAMESPACE_BEGIN
2928

src/longscroll-qt.pro

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ CONFIG += c++11
3636
QMAKE_CXXFLAGS_RELEASE += /O2
3737
}
3838

39+
!isEmpty(CONTINUOUS_INTEGRATION) {
40+
msvc {
41+
QMAKE_CXXFLAGS += /WX
42+
QMAKE_LFLAGS += /WX
43+
} else {
44+
QMAKE_CXXFLAGS += -Werror
45+
QMAKE_LFLAGS += -Werror
46+
}
47+
}
3948

4049
DEFINES += LONGSCROLLQT_LIBRARY
4150

src/longscroll-qt_qtincludes.h

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,24 @@ along with longscroll-qt. If not see <http://www.gnu.org/licenses/>.
2323
#include <QtGlobal>
2424

2525
#ifdef Q_CC_GNU
26-
#pragma GCC diagnostic push
27-
#pragma GCC diagnostic ignored "-Wconversion"
28-
#pragma GCC diagnostic ignored "-Wfloat-conversion"
26+
# pragma GCC diagnostic push
27+
# pragma GCC diagnostic ignored "-Wconversion"
28+
# if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))
29+
# pragma GCC diagnostic ignored "-Wfloat-conversion"
30+
# endif
31+
#endif
32+
#ifdef Q_CC_CLANG
33+
# pragma GCC diagnostic ignored "-Wdeprecated"
34+
# pragma GCC diagnostic ignored "-Wused-but-marked-unused"
35+
# pragma GCC diagnostic ignored "-Wfloat-equal"
36+
# pragma GCC diagnostic ignored "-Wsign-conversion"
37+
# pragma GCC diagnostic ignored "-Wexit-time-destructors"
38+
# pragma GCC diagnostic ignored "-Wcovered-switch-default"
39+
# pragma GCC diagnostic ignored "-Wdisabled-macro-expansion"
40+
# ifdef Q_OS_MAC
41+
# pragma GCC diagnostic ignored "-Wdeprecated"
42+
# else
43+
# endif
2944
#endif
3045

3146
#include <QScrollArea>
@@ -35,6 +50,7 @@ along with longscroll-qt. If not see <http://www.gnu.org/licenses/>.
3550
#include <QPainter>
3651
#include <QMouseEvent>
3752
#include <QImageReader>
53+
#include <QAbstractItemView>
3854

3955
#ifdef Q_CC_GNU
4056
#pragma GCC diagnostic pop

0 commit comments

Comments
 (0)