diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-07 12:00:12 +0200 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-07 12:14:02 +0200 |
| commit | bc661ed43e10e88976d2227217bbbba527e1890a (patch) | |
| tree | 15561b91e1d34aca928bf21d97533b8fd83a9bfa /simpletest | |
| parent | 4c86d3472bb21e96da68d30677d2500811245274 (diff) | |
Cleanup work to match Qt habits.
Change-Id: I6f177c05ac464e13096ed9d517736e0b06773f66
Reviewed-on: http://codereview.qt.nokia.com/4340
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'simpletest')
| -rw-r--r-- | simpletest/simpletest.pro | 14 | ||||
| -rw-r--r-- | simpletest/tst_simple_mimetypes.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/simpletest/simpletest.pro b/simpletest/simpletest.pro index 0cf9b75..ba6de14 100644 --- a/simpletest/simpletest.pro +++ b/simpletest/simpletest.pro @@ -13,7 +13,7 @@ QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -Wshadow -Wno-long-lo # dependency management QMAKE_CXXFLAGS += -MMD include_dependencies.target = include_dependencies -include_dependencies.commands = @if grep \"^include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi +include_dependencies.commands = @if grep \"^-include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"-include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi QMAKE_EXTRA_TARGETS += include_dependencies POST_TARGETDEPS += include_dependencies @@ -30,10 +30,10 @@ SOURCES += tst_simple_mimetypes.cpp # No headers -SOURCES += $$API_DIR/src/declarative/declarativemimetype.cpp \ - $$API_DIR/src/declarative/declarativemimetyperegistry.cpp \ - $$API_DIR/src/declarative/declarativeserviceaction.cpp +SOURCES += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype.cpp \ + $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp \ + $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction.cpp -HEADERS += $$API_DIR/src/declarative/declarativemimetype_p.h \ - $$API_DIR/src/declarative/declarativemimetyperegistry_p.h \ - $$API_DIR/src/declarative/declarativeserviceaction_p.h +HEADERS += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype_p.h \ + $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h \ + $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction_p.h diff --git a/simpletest/tst_simple_mimetypes.cpp b/simpletest/tst_simple_mimetypes.cpp index 73e52bc..d21a106 100644 --- a/simpletest/tst_simple_mimetypes.cpp +++ b/simpletest/tst_simple_mimetypes.cpp @@ -1,4 +1,4 @@ -#include "mimetyperegistry.h" +#include "qmimetyperegistry.h" #include <QtCore/QCoreApplication> #include <QtCore/QDebug> |