8 files changed, 14 insertions, 81 deletions
diff --git a/src/plugins/geometryloaders/configure.pri b/src/plugins/geometryloaders/configure.pri
deleted file mode 100644
index 1e104f57e..000000000
--- a/src/plugins/geometryloaders/configure.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-defineTest(qtConfLibrary_fbx) {
-    libdir =
-
-    prefix = $$getenv(FBXSDK)
-    !isEmpty(prefix) {
-        !qtConfResolvePathIncs($${1}.includedir, $${prefix}/include, $$2): \
-            return(false)
-        !win32: libdir += $${prefix}/lib
-    }
-
-    libs = $$getenv(FBXSDK_LIBS)
-    isEmpty(libs): \
-        libs = $$eval($${1}.libs)
-
-    !qtConfResolvePathLibs($${1}.libs, $$libdir, $$libs): \
-        return(false)
-
-    return(true)
-}
-
diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp
index 09e4ba3a8..802548994 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp
@@ -12,10 +12,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
+using namespace Qt3DCore;
+
 Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader", QtWarningMsg)
 
 BaseGeometryLoader::BaseGeometryLoader()
diff --git a/src/plugins/geometryloaders/default/default.pro b/src/plugins/geometryloaders/default/default.pro
deleted file mode 100644
index c126b5844..000000000
--- a/src/plugins/geometryloaders/default/default.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TARGET = defaultgeometryloader
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
-
-HEADERS += \
-    basegeometryloader_p.h \
-
-SOURCES += \
-    main.cpp \
-    basegeometryloader.cpp \
-    objgeometryloader.cpp \
-    plygeometryloader.cpp \
-    stlgeometryloader.cpp \
-
-DISTFILES += \
-    default.json
-
-PLUGIN_TYPE = geometryloaders
-PLUGIN_CLASS_NAME = DefaultGeometryLoaderPlugin
-load(qt_plugin)
diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp
index dc41ca492..e741426c1 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp
@@ -66,10 +66,19 @@ bool ObjGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
         if (lineSize > 0 && line[0] != '#') {
             if (line[lineSize - 1] == '\n')
                 --lineSize; // chop newline
+            if (lineSize <= 0)
+                continue;
+
             if (line[lineSize - 1] == '\r')
                 --lineSize; // chop newline also for CRLF format
-            while (line[lineSize - 1] == ' ' || line[lineSize - 1] == '\t')
+            if (lineSize <= 0)
+                continue;
+
+            while (lineSize > 0 && (line[lineSize - 1] == ' ' || line[lineSize - 1] == '\t')) {
                 --lineSize; // chop trailing spaces
+            }
+            if (lineSize <= 0)
+                continue;
 
             const ByteArraySplitter tokens(line, line + lineSize, ' ', Qt::SkipEmptyParts);
 
diff --git a/src/plugins/geometryloaders/fbx/fbx.pro b/src/plugins/geometryloaders/fbx/fbx.pro
deleted file mode 100644
index a9c17d4e7..000000000
--- a/src/plugins/geometryloaders/fbx/fbx.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TARGET = fbxgeometryloader
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
-
-HEADERS += \
-    fbxgeometryloader.h \
-
-SOURCES += \
-    main.cpp \
-    fbxgeometryloader.cpp \
-
-DISTFILES += \
-    fbx.json
-
-include($$OUT_PWD/../qtgeometryloaders-config.pri)
-QMAKE_USE += fbx
-
-PLUGIN_TYPE = geometryloaders
-PLUGIN_CLASS_NAME = fbxGeometryLoaderPlugin
-load(qt_plugin)
diff --git a/src/plugins/geometryloaders/geometryloaders.pro b/src/plugins/geometryloaders/geometryloaders.pro
deleted file mode 100644
index 764c615da..000000000
--- a/src/plugins/geometryloaders/geometryloaders.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-qtConfig(regularexpression) : SUBDIRS += default
-SUBDIRS += gltf
-qtConfig(qt3d-fbxsdk) : SUBDIRS += fbx
diff --git a/src/plugins/geometryloaders/gltf/gltf.pro b/src/plugins/geometryloaders/gltf/gltf.pro
deleted file mode 100644
index 815226b4e..000000000
--- a/src/plugins/geometryloaders/gltf/gltf.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = gltfgeometryloader
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
-
-HEADERS += \
-    gltfgeometryloader.h \
-
-SOURCES += \
-    main.cpp \
-    gltfgeometryloader.cpp \
-
-DISTFILES += \
-    gltf.json
-
-PLUGIN_TYPE = geometryloaders
-PLUGIN_CLASS_NAME = GLTFGeometryLoaderPlugin
-load(qt_plugin)
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
index 4b2c6a916..16d5d7e5d 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
@@ -21,10 +21,11 @@ QT_BEGIN_NAMESPACE
     static_cast<const wchar_t*>(static_cast<const void*>(string.utf16()))
 #endif
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
+using namespace Qt3DCore;
+
 Q_LOGGING_CATEGORY(GLTFGeometryLoaderLog, "Qt3D.GLTFGeometryLoader", QtWarningMsg)
 
 #define KEY_ASSET        QLatin1String("asset")