Skip to content

Commit 5ed1d76

Browse files
committed
Do not modify QT modules in the pri file. Use the pri file to build the library - DRY. Add the CI files to the project so that they're editable from the IDE.
1 parent ca49ce3 commit 5ed1d76

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

qtcsv.pri

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
2-
QT -= gui
1+
CONFIG *= qt
2+
QT *= core
33

4-
DEFINES += QTCSV_MAKE_LIB
4+
!contains(DEFINES, QTCSV_LIBRARY): DEFINES += QTCSV_MAKE_LIB
55

66
INCLUDEPATH += $$PWD/include \
77
$$PWD

qtcsv.pro

+7-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
QT -= gui
1+
QT = core
22
TARGET = qtcsv
33
TEMPLATE = lib
44
VERSION = 1.5.0
@@ -16,34 +16,21 @@ win32:TARGET_EXT = .dll
1616
}
1717

1818
DEFINES += QTCSV_LIBRARY
19-
INCLUDEPATH += $$PWD/include/
19+
20+
include(qtcsv.pri)
2021

2122
# Uncomment this settings if you want to manually set destination directory for
2223
# compiled library
2324
#CONFIG(release, debug|release): DESTDIR = $$PWD
2425
#CONFIG(debug, debug|release): DESTDIR = $$PWD
2526

26-
SOURCES += \
27-
sources/writer.cpp \
28-
sources/variantdata.cpp \
29-
sources/stringdata.cpp \
30-
sources/reader.cpp \
31-
sources/contentiterator.cpp
32-
33-
HEADERS += \
34-
include/qtcsv/qtcsv_global.h \
35-
include/qtcsv/writer.h \
36-
include/qtcsv/variantdata.h \
37-
include/qtcsv/stringdata.h \
38-
include/qtcsv/reader.h \
39-
include/qtcsv/abstractdata.h \
40-
sources/filechecker.h \
41-
sources/contentiterator.h \
42-
sources/symbols.h
43-
4427
DISTFILES += \
4528
CMakeLists.txt
4629

30+
OTHER_FILES += \
31+
appveyor.yml \
32+
.travis.yml
33+
4734
message(=== Configuration of qtcsv ===)
4835
message(Qt version: $$[QT_VERSION])
4936
message(Library version: $$VERSION)

0 commit comments

Comments
 (0)