diff options
-rw-r--r-- | include/QtMimeTypes/QtMimeTypes.pro | 8 | ||||
-rw-r--r-- | mimetypes-nolibs.pri | 12 | ||||
-rw-r--r-- | qtmimetypes.pro | 1 | ||||
-rw-r--r-- | src/mimetypes/mimetypes.pro | 9 |
4 files changed, 18 insertions, 12 deletions
diff --git a/include/QtMimeTypes/QtMimeTypes.pro b/include/QtMimeTypes/QtMimeTypes.pro index 66fabb4..a979987 100644 --- a/include/QtMimeTypes/QtMimeTypes.pro +++ b/include/QtMimeTypes/QtMimeTypes.pro @@ -1,3 +1,5 @@ +include(../../mimetypes-nolibs.pri) + contains($$list($$[QT_VERSION]),4.[6-9].*) { TEMPLATE = subdirs } else { @@ -8,10 +10,6 @@ the_includes.files += QMimeDatabase \ QMimeType \ unix:!symbian { - maemo5 { - the_includes.path = /opt/usr/include/qt5/QtMimeTypes - } else { - the_includes.path = /usr/include/qt5/QtMimeTypes - } + the_includes.path = $${INCLUDEDIR}/QtMimeTypes INSTALLS += the_includes } diff --git a/mimetypes-nolibs.pri b/mimetypes-nolibs.pri index c77a2c1..b0d9052 100644 --- a/mimetypes-nolibs.pri +++ b/mimetypes-nolibs.pri @@ -1,3 +1,6 @@ +!isEmpty(MIMETYPES_PRI_INCLUDED):error("mimetypes-no-libs.pri already included") +MIMETYPES_PRI_INCLUDED = 1 + INCLUDEPATH += $$PWD/include/QtMimeTypes INCLUDEPATH += $$PWD/src/mimetypes/inqt5 INCLUDEPATH += $$PWD/src/mimetypes $$PWD/src/imports/mimetypes @@ -9,3 +12,12 @@ mac|darwin: { } else { QMAKE_CXXFLAGS += -std=c++0x } + +unix { + isEmpty(PREFIX) { + PREFIX = /usr + } + + INCLUDEDIR = $${PREFIX}/include + LIBDIR = ${{PREFIX}/lib +} diff --git a/qtmimetypes.pro b/qtmimetypes.pro index 007371a..5beb5f4 100644 --- a/qtmimetypes.pro +++ b/qtmimetypes.pro @@ -1,3 +1,4 @@ +include(mimetypes-nolibs.pri) include(doc/doc.pri) # check qt version diff --git a/src/mimetypes/mimetypes.pro b/src/mimetypes/mimetypes.pro index abe8dc1..1289aae 100644 --- a/src/mimetypes/mimetypes.pro +++ b/src/mimetypes/mimetypes.pro @@ -61,12 +61,7 @@ symbian { } unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - the_includes.path = /opt/usr/include/qt5/QtMimeTypes - } else { - target.path = /usr/lib - the_includes.path = /usr/include/qt5/QtMimeTypes - } + target.path = ${{LIBDIR} + the_includes.path = $${INCLUDEDIR}/QtMimeTypes INSTALLS += target the_includes } |