Merge pull request #115 from jonwd7/develop

2.0dev7

Author: hexabits

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*.{h,cpp}]
+indent_size = 4
+indent_style = tab
+
+[*.{pro,pri}]
+indent_size = 4
+indent_style = tab
+
+[*.ui]
+indent_size = 1
+indent_style = space
+
+[*.{frag,prog,vert}]
+indent_size = 4
+indent_style = tab

.gitignore

@@ -31,6 +31,7 @@ ui_*.h
 
 # Qt Creator
 NifSkope.pro.user
+.qmake.stash
 
 # Binaries
 NifSkope

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/zlib"]
 	path = lib/zlib
 	url = https://github.com/madler/zlib.git
+[submodule "lib/gli"]
+	path = lib/gli
+	url = https://github.com/g-truc/gli.git

.travis.yml

@@ -7,12 +7,12 @@ os:
 addons:
   apt:
     sources:
-      - sourceline: 'ppa:beineri/opt-qt551-trusty'
+      - sourceline: 'ppa:beineri/opt-qt571-trusty'
     packages: [
       # static analysis
       clang-3.6,
       # qt5 requirement
-      qt55-meta-minimal
+      qt57-meta-minimal
     ]
 matrix:
   fast_finish: true
@@ -25,8 +25,14 @@ matrix:
     - env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 "
 
 before_install:
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get update -qq; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then QT_ENV_SCRIPT=$(find /opt -name 'qt*-env.sh'); source $QT_ENV_SCRIPT; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; brew install [email protected]; export PATH="/usr/local/opt/[email protected]/bin:$PATH"; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; brew install [email protected]; export PATH="/usr/local/opt/[email protected]/bin:$PATH"; fi
+
+install:
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get install -qq g++-6; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90; fi
 
 script:
   - qmake --version