diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-07 16:39:30 +0200 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-08 14:29:26 +0200 |
| commit | c7bd94fcc0456d03d80aba6d80bd4ff2a659ca87 (patch) | |
| tree | 4cfec2edcc5dd36630df772f95b06c84914cfb2e /src/mimetypes/mimetypes.pro | |
| parent | 1eb97c5c4a225eab9762d2e8a805c90464279805 (diff) | |
Removed local install weirdnesses.
Change-Id: I3be4e92e76918b05f17a20b59a6168d6154897ea
Reviewed-on: http://codereview.qt-project.org/4445
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'src/mimetypes/mimetypes.pro')
| -rw-r--r-- | src/mimetypes/mimetypes.pro | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/mimetypes/mimetypes.pro b/src/mimetypes/mimetypes.pro index 642b30e..ef0acd4 100644 --- a/src/mimetypes/mimetypes.pro +++ b/src/mimetypes/mimetypes.pro @@ -1,11 +1,14 @@ -CONFIG += qt +#CONFIG += qt TEMPLATE = lib TARGET = qt-mimetypes -DESTDIR = ../../lib # QtCore/qlist.h uses /usr/include/limits.h which uses does not compile with -pedantic. -#MAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat -QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat +#MAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor +QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -Wshadow -Wno-long-long -Wnon-virtual-dtor +mac|darwin: { +} else { + QMAKE_CXXFLAGS += -Wc++0x-compat +} # dependency management QMAKE_CXXFLAGS += -MMD @@ -17,7 +20,7 @@ POST_TARGETDEPS += include_dependencies API_DIR = ../.. -INCLUDEPATH += $$API_DIR +INCLUDEPATH += $$API_DIR/src/mimetypes SOURCES += $$API_DIR/src/mimetypes/qmimetype.cpp \ @@ -31,3 +34,12 @@ HEADERS += $$API_DIR/src/mimetypes/qmimetypesfwd.h \ $$API_DIR/src/mimetypes/qmimetyperegistry.h \ $$API_DIR/src/mimetypes/qserviceaction.h \ $$API_DIR/src/mimetypes/qserviceaction_p.h + + +the_includes.files += $$API_DIR/src/mimetypes/qmimetypesfwd.h \ + $$API_DIR/src/mimetypes/qmimetype.h \ + $$API_DIR/src/mimetypes/qmimetyperegistry.h \ + $$API_DIR/src/mimetypes/qserviceaction.h + + +INSTALLS += the_includes target |