Skip to content

Commit db37634

Browse files
committed
build and use mimetypes
1 parent a7a940b commit db37634

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

src/webdriver/extension_qt/q_content_type_resolver.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
1111
#include <QtCore/QMimeDatabase>
1212
#include <QtCore/QMimeType>
13+
#else
14+
#include "third_party/mimetypes-qt4/include/QMimeDatabase"
15+
#include "third_party/mimetypes-qt4/include/QMimeType"
1316
#endif
1417

1518
namespace webdriver {
@@ -69,16 +72,11 @@ Error* QContentTypeResolver::resolveContentType(const std::string& url, std::str
6972
}
7073
} else {
7174
// non http schemes
72-
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
7375
QMimeDatabase mimeDatabase;
7476
QMimeType mimeType;
7577
mimeType = mimeDatabase.mimeTypeForUrl(contentUrl);
7678

7779
qmimetype = mimeType.name();
78-
#else
79-
// TODO: implement for qt4
80-
#endif
81-
8280
}
8381

8482
mimetype = qmimetype.toStdString();

wd_ext_qt.gyp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@
5858
'src/third_party/pugixml/pugixml.cpp'
5959
],
6060

61+
'conditions': [
62+
63+
['<(QT5) == 0', {
64+
'dependencies': [
65+
'src/third_party/mimetypes-qt4/mimetypes-qt4.gyp:mimetypes-qt4',
66+
],
67+
} ]
68+
], # conditions
69+
6170
}, {
6271
'target_name': 'WebDriver_extension_qt_web',
6372
'type': 'static_library',
@@ -82,6 +91,7 @@
8291
'<(INTERMEDIATE_DIR)/moc_qwebkit_proxy.cc',
8392
'src/third_party/webdriver/atoms.cc',
8493
],
94+
8595
} , {
8696
'target_name': 'WebDriver_extension_qt_quick',
8797
'type': 'static_library',

0 commit comments

Comments
 (0)