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 /unittests | |
| 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 'unittests')
| -rw-r--r-- | unittests/declarative/tst_declarative_mimetypes.pro | 7 | ||||
| -rw-r--r-- | unittests/unittests.pro | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/unittests/declarative/tst_declarative_mimetypes.pro b/unittests/declarative/tst_declarative_mimetypes.pro index 45cbc0a..1b95b0d 100644 --- a/unittests/declarative/tst_declarative_mimetypes.pro +++ b/unittests/declarative/tst_declarative_mimetypes.pro @@ -1,14 +1,15 @@ TEMPLATE=app TARGET=tst_declarative_mimetypes -CONFIG += warn_on qmltestcase +#CONFIG += warn_on qmltestcase +QT += qmltest # runtime environment -LIBS += -L ../../lib -lqt-mimetypes +LIBS += -L ../../src/mimetypes -lqt-mimetypes API_DIR = ../.. -INCLUDEPATH += $$API_DIR +INCLUDEPATH += $$API_DIR .. SOURCES += $$API_DIR/unittests/declarative/tst_declarative_mimetypes.cpp diff --git a/unittests/unittests.pro b/unittests/unittests.pro index 0c5c407..96a323a 100644 --- a/unittests/unittests.pro +++ b/unittests/unittests.pro @@ -3,7 +3,11 @@ TEMPLATE = app TARGET = tst_mimetypes DEPENDPATH += . -QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat +QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor +mac|darwin: { +} else { + QMAKE_CXXFLAGS += -Wc++0x-compat +} # dependency management QMAKE_CXXFLAGS += -MMD @@ -13,12 +17,12 @@ QMAKE_EXTRA_TARGETS += include_dependencies POST_TARGETDEPS += include_dependencies # runtime environment -LIBS += -L ../lib -lqt-mimetypes +LIBS += -L ../src/mimetypes -lqt-mimetypes API_DIR = .. -INCLUDEPATH += $$API_DIR/src/mimetypes $$API_DIR/unittests +INCLUDEPATH += $$API_DIR/src/mimetypes $$API_DIR/unittests ../src/mimetypes SOURCES += tst_mimetypes-empty.cpp |