Skip to content

Commit

Permalink
Merge pull request #184 from ryankim86/master
Browse files Browse the repository at this point in the history 
5.7 Windows Compatibility
  • Loading branch information
@ldanzinger
ldanzinger authored Jun 23, 2016
2 parents 2ccdca3 + 3c86f28 commit 1e0f11a
Show file tree
Hide file tree
Showing 101 changed files with 1,212 additions and 0 deletions.
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/DisplayInformation/GORenderers/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/DisplayInformation/GOSymbols/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/DisplayInformation/GraphicsOverlayDictionaryRenderer/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <QQuickView>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -28,6 +29,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ...SRuntimeSDKQt_CppSamples/DisplayInformation/GraphicsOverlayDictionaryRenderer_3D/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <QQuickView>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -28,6 +29,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/DisplayInformation/IdentifyGraphics/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/DisplayInformation/ShowLegend/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -31,6 +32,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/EditData/AddFeaturesFeatureService/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/EditData/EditFeatureAttachments/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -31,6 +32,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/EditData/UpdateAttributesFeatureService/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/EditData/UpdateGeometryFeatureService/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/Features/FeatureLayerChangeRenderer/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/Features/FeatureLayerDefinitionExpression/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <QQuickView>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -28,6 +29,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
12 changes: 12 additions & 0 deletions ArcGISRuntimeSDKQt_CppSamples/Features/FeatureLayerFeatureService/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <QCommandLineParser>
#include <QDir>
#include <QQmlEngine>
#include <QSurfaceFormat>

#ifdef Q_OS_WIN
#include <Windows.h>
Expand All @@ -30,6 +31,17 @@ using namespace Esri::ArcGISRuntime;

int main(int argc, char *argv[])
{
#if defined(Q_OS_WIN)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 6)
{
// Workaround for Qt versions greater than 5.6
// Force to OpenGL ES 3
QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
fmt.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif

QGuiApplication app(argc, argv);

#ifdef Q_OS_WIN
Expand Down
Loading

0 comments on commit 1e0f11a

Please sign in to comment.