diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-31 10:19:05 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-31 10:20:34 +0200 |
| commit | efac3cd245e2610924133e304d15bf726f5864f5 (patch) | |
| tree | c872124a0ea7c40056b69babaf14478f0cb02ce4 /qtenginio.pro | |
| parent | 99c09ff33b7516a568455c6980f0f81c59a4fb3a (diff) | |
| parent | 30ee95cd19f9a435ce337b4f651175ed2e8ba2e5 (diff) | |
| download | qtenginio-efac3cd245e2610924133e304d15bf726f5864f5.tar.gz | |
Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.2.01.2.0
Conflicts:
.qmake.conf
LICENSE.LGPLv21
LICENSE.LGPLv3
src/enginio_client/chunkdevice_p.h
src/enginio_client/enginio.h
src/enginio_client/enginiobackendconnection.cpp
src/enginio_client/enginiobackendconnection_p.h
src/enginio_client/enginiobasemodel.h
src/enginio_client/enginiobasemodel_p.h
src/enginio_client/enginioclient.cpp
src/enginio_client/enginioclient.h
src/enginio_client/enginioclient_global.h
src/enginio_client/enginioclient_p.h
src/enginio_client/enginioclientconnection.h
src/enginio_client/enginiodummyreply.cpp
src/enginio_client/enginiodummyreply_p.h
src/enginio_client/enginiofakereply.cpp
src/enginio_client/enginiofakereply_p.h
src/enginio_client/enginioidentity.cpp
src/enginio_client/enginioidentity.h
src/enginio_client/enginiomodel.cpp
src/enginio_client/enginiomodel.h
src/enginio_client/enginiooauth2authentication.h
src/enginio_client/enginioobjectadaptor_p.h
src/enginio_client/enginioreply.cpp
src/enginio_client/enginioreply.h
src/enginio_client/enginioreply_p.h
src/enginio_client/enginioreplystate.h
src/enginio_client/enginiostring.cpp
src/enginio_client/enginiostring_p.h
src/enginio_plugin/enginioplugin.cpp
src/enginio_plugin/enginioplugin_p.h
src/enginio_plugin/enginioqmlclient.cpp
src/enginio_plugin/enginioqmlclient_p.h
src/enginio_plugin/enginioqmlclient_p_p.h
src/enginio_plugin/enginioqmlmodel.cpp
src/enginio_plugin/enginioqmlmodel_p.h
src/enginio_plugin/enginioqmlobjectadaptor_p.h
src/enginio_plugin/enginioqmlreply.cpp
src/enginio_plugin/enginioqmlreply_p.h
tests/auto/common/common.cpp
tests/auto/common/common.h
tests/auto/enginioclient/tst_enginioclient.cpp
tests/auto/enginiomodel/tst_enginiomodel.cpp
tests/auto/files/tst_files.cpp
tests/auto/identity/common/identitycommon.h
tests/auto/identity/oauth2authentication/tst_oauth2authentication.cpp
tests/auto/notifications/tst_notifications.cpp
tests/auto/qmltests/tst_enginioclient.qml
tests/auto/qmltests/tst_enginioreply.qml
tests/auto/qmltests/tst_files.qml
tests/auto/qmltests/tst_identity.qml
tests/auto/qmltests/tst_model.qml
tests/auto/qmltests/tst_qmltest.cpp
tests/auto/qmltests/tst_query.qml
Change-Id: Icb6a167ba58b41e1a8e4d2c8f78213eae9472864
Diffstat (limited to 'qtenginio.pro')
| -rw-r--r-- | qtenginio.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtenginio.pro b/qtenginio.pro index 300ea20..799f04f 100644 --- a/qtenginio.pro +++ b/qtenginio.pro @@ -1,5 +1,5 @@ # iOS does not require OpenSSL and always passes -!ios:requires(contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked)) +!ios:requires(contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked)) lessThan(QT_MAJOR_VERSION, 5): error("The Enginio Qt library only supports Qt 5.") load(configure) |