From 24be64630dd7d37e54e70ef4d636b986c00f00ae Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Thu, 24 Sep 2015 23:26:41 +0200
Subject: [PATCH 01/36] Removed openmp flag, made VC flags specific to
 win32-msvc*.

---
 features/buildflags.prf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/features/buildflags.prf b/features/buildflags.prf
index dd9f04b5..e91e14dc 100644
--- a/features/buildflags.prf
+++ b/features/buildflags.prf
@@ -7,7 +7,6 @@ message("buildflags for $$_PRO_FILE_PWD_ with $$QMAKESPEC")
 CONFIG += legacy-opengl
 win32-msvc*:CONFIG += debug_and_release
 CONFIG += warn_on
-!macx-ios*:CONFIG += openmp
 CONFIG(debug, debug|release): DEFINES += _DEBUG
 CONFIG(debug, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # don't timeout locks when stepping in a debugger
 CONFIG(release, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # use simple locks in release
@@ -87,7 +86,7 @@ macx {
     }
 }
 
-win32 {
+win32-msvc* {
     DEFINES += _SCL_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS
 
     CONFIG(debug, debug|release) {

From 0884fccd3f21c06e7540db08f687632cfbdc7c7b Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sun, 20 Sep 2015 15:21:54 +0200
Subject: [PATCH 02/36] Update appveyor.yml

Get windows submodule
---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 88bb0766..2cf4f4fc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,8 @@ install:
   - set PATH=%PATH%;%QTDIR%\bin
 #  - set PATH=%PATH%;C:\MinGW\bin
 #  - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
+  - git submodule init
+  - git submodule update --depth 1 3rdparty\windows
 build_script:
   - cd quick
   - qmake -r

From bf8356ddf2618ee66c970b23799db99d56221b53 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sun, 20 Sep 2015 20:48:09 +0200
Subject: [PATCH 03/36] Update appveyor.yml

Can we build with mingw?
---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2cf4f4fc..2b9a5f52 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,12 +1,12 @@
 install:
-  - set QTDIR=C:\Qt\5.5\msvc2013_64
-#  - set QTDIR=C:\Qt\5.5\mingw492_32
+#  - set QTDIR=C:\Qt\5.5\msvc2013_64
+  - set QTDIR=C:\Qt\5.5\mingw492_32
   - set PATH=%PATH%;%QTDIR%\bin
-#  - set PATH=%PATH%;C:\MinGW\bin
-#  - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
+  - set PATH=%PATH%;C:\MinGW\bin
+  - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
 build_script:
   - cd quick
   - qmake -r
-#  - mingw32-make
+  - mingw32-make

From 19a763173df5bd31a61a380ecdef2f97b0c312d6 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 19:12:39 +0200
Subject: [PATCH 04/36] Update appveyor.yml

Try setting a qmake spec...
---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2b9a5f52..fc7db4c6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,5 +8,6 @@ install:
   - git submodule update --depth 1 3rdparty\windows
 build_script:
   - cd quick
+  - qmake -spec win32-g++
   - qmake -r
-  - mingw32-make
+  - make

From aafd275d7db0a3fc1ec3936c0425a81a0b88bfe8 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 19:18:25 +0200
Subject: [PATCH 05/36] Update appveyor.yml

Use mingw32-make, not make...
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fc7db4c6..4e00c2c4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,4 +10,4 @@ build_script:
   - cd quick
   - qmake -spec win32-g++
   - qmake -r
-  - make
+  - mingw32-make

From 7b894448fb5256830301f1bc922c9fb4a854b919 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 20:11:18 +0200
Subject: [PATCH 06/36] Update appveyor.yml

---
 appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4e00c2c4..ae7f12bf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,6 +8,5 @@ install:
   - git submodule update --depth 1 3rdparty\windows
 build_script:
   - cd quick
-  - qmake -spec win32-g++
-  - qmake -r
+  - qmake -r -spec win32-g++
   - mingw32-make

From 08c0d52df38e03940fd55cf386b07224aa71c17d Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 20:26:01 +0200
Subject: [PATCH 07/36] Update appveyor.yml

What's in the 5.5 folder anyway?
---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index ae7f12bf..0589a39b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,7 @@ install:
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
+  - dir /s /b /a:d C:\Qt\5.5
 build_script:
   - cd quick
   - qmake -r -spec win32-g++

From c5827a1aafc61a9070c709b4ec9afaa32922e86c Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 20:31:08 +0200
Subject: [PATCH 08/36] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0589a39b..0aba134e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,9 +5,9 @@ install:
   - set PATH=%PATH%;C:\MinGW\bin
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
   - git submodule init
-  - git submodule update --depth 1 3rdparty\windows
+#  - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5
 build_script:
   - cd quick
-  - qmake -r -spec win32-g++
+  - qmake -r -Wall -spec win32-g++
   - mingw32-make

From b2df6d68addda42680d97ded0b86ad30d8190815 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Wed, 23 Sep 2015 17:01:44 +0200
Subject: [PATCH 09/36] Maybe I'll need that submodule now...

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0aba134e..1180eaf7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ install:
   - set PATH=%PATH%;C:\MinGW\bin
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
   - git submodule init
-#  - git submodule update --depth 1 3rdparty\windows
+  - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5
 build_script:
   - cd quick

From adcecd27c256c698436395b1d7c2b0aca97018e3 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Thu, 24 Sep 2015 22:34:56 +0200
Subject: [PATCH 10/36] Attempt to fix build by setting QMAKEFEATURES variable.

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 1180eaf7..2f10832e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,7 @@ install:
   - set PATH=%PATH%;%QTDIR%\bin
   - set PATH=%PATH%;C:\MinGW\bin
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
+  - set QMAKEFEATURES=C:\projects\freq\features
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5

From fbef0fe535b91fef7c8601dc24dea567b223926c Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Thu, 24 Sep 2015 23:52:13 +0200
Subject: [PATCH 11/36] What's inside C:\MinGW and what's in %PATH%?

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 2f10832e..c653b1e4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,6 +8,8 @@ install:
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5
+  - dir /s /b /a:d C:\MinGW
+  - echo %PATH%
 build_script:
   - cd quick
   - qmake -r -Wall -spec win32-g++

From fa964a8fb805eb7ca0f5093b120bf384903742e5 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Fri, 25 Sep 2015 00:15:29 +0200
Subject: [PATCH 12/36] Don't add old MinGW to %PATH%. Duh.

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c653b1e4..07839dec 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,13 +2,13 @@ install:
 #  - set QTDIR=C:\Qt\5.5\msvc2013_64
   - set QTDIR=C:\Qt\5.5\mingw492_32
   - set PATH=%PATH%;%QTDIR%\bin
-  - set PATH=%PATH%;C:\MinGW\bin
+#  - set PATH=%PATH%;C:\MinGW\bin
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
   - set QMAKEFEATURES=C:\projects\freq\features
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5
-  - dir /s /b /a:d C:\MinGW
+  #- dir /s /b /a:d C:\MinGW
   - echo %PATH%
 build_script:
   - cd quick

From e103a4654bf31578994c75a0ab205c54b2216e41 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Fri, 25 Sep 2015 00:19:52 +0200
Subject: [PATCH 13/36] =?UTF-8?q?Add=20old=20MinGW=20to=20=C2=A4PATH%=20*A?=
 =?UTF-8?q?FTER*=20Qt\Tools\MinGW.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 07839dec..8c1eb677 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,13 +2,13 @@ install:
 #  - set QTDIR=C:\Qt\5.5\msvc2013_64
   - set QTDIR=C:\Qt\5.5\mingw492_32
   - set PATH=%PATH%;%QTDIR%\bin
-#  - set PATH=%PATH%;C:\MinGW\bin
   - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
+  - set PATH=%PATH%;C:\MinGW\bin
   - set QMAKEFEATURES=C:\projects\freq\features
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows
   - dir /s /b /a:d C:\Qt\5.5
-  #- dir /s /b /a:d C:\MinGW
+  - dir /s /b /a:d C:\MinGW
   - echo %PATH%
 build_script:
   - cd quick

From 3723aa44e97d980d49e67b62e91b1312da179c77 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Fri, 25 Sep 2015 00:25:35 +0200
Subject: [PATCH 14/36] Fixed tools path and removed old MinGW path... again.

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8c1eb677..f560d19b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,8 +2,8 @@ install:
 #  - set QTDIR=C:\Qt\5.5\msvc2013_64
   - set QTDIR=C:\Qt\5.5\mingw492_32
   - set PATH=%PATH%;%QTDIR%\bin
-  - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
-  - set PATH=%PATH%;C:\MinGW\bin
+  - set PATH=%PATH%;C:\Qt\Tools\mingw492_32\bin
+#  - set PATH=%PATH%;C:\MinGW\bin
   - set QMAKEFEATURES=C:\projects\freq\features
   - git submodule init
   - git submodule update --depth 1 3rdparty\windows

From 1eb39fe7d0a8c2deb5ac7fc29233d65f2372d2f9 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Fri, 25 Sep 2015 00:25:35 +0200
Subject: [PATCH 15/36] Updated 3rdparty/windows submodule.

---
 3rdparty/windows | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/windows b/3rdparty/windows
index 3b929f32..0200d6f7 160000
--- a/3rdparty/windows
+++ b/3rdparty/windows
@@ -1 +1 @@
-Subproject commit 3b929f321470457fefed2e3c38b118d73ad6822d
+Subproject commit 0200d6f7e3b076809c8249711dc471d529b3e347

From df6019f715550f6f5e191aa9b78ff2dfaa3d930e Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Mon, 21 Dec 2015 11:16:33 +0100
Subject: [PATCH 16/36] Don't call pthread_setname_np when compiling with
 MinGW.

---
 lib/justmisc/thread_pool.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/justmisc/thread_pool.cpp b/lib/justmisc/thread_pool.cpp
index b0941015..99c30239 100644
--- a/lib/justmisc/thread_pool.cpp
+++ b/lib/justmisc/thread_pool.cpp
@@ -37,7 +37,9 @@ thread_pool::
 #ifdef __clang__
                         pthread_setname_np(ss.str ().c_str ());
 #else
+#ifndef __MINGW32__
                         pthread_setname_np(pthread_self(), ss.str ().c_str ());
+#endif
 #endif
                     }
 #endif

From 7ef4f72d7b3053ef5b6da08898ed1e9af6463375 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Tue, 22 Dec 2015 16:10:42 +0100
Subject: [PATCH 17/36] Commit for great justice

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 4648d582..27d29870 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freq source code
+# Freq source code
 /===================\
 |Scalograms are cool|
 \===================/

From f63bfc26a7c90b2b1aa9095e3aa0a863cc520c6c Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 22:53:52 +0200
Subject: [PATCH 18/36] Update circle.yml

Install qt5 and g++ 4.9.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 76968c43..d031f597 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 dependencies:
   pre:
-  - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential
+  - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-4.9
 checkout:
   post:
   - git submodule init

From fcbaf4b5a65890d2b9a4728589b10aa114b9131a Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 22:59:10 +0200
Subject: [PATCH 19/36] Update circle.yml

Run apt-get update.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index d031f597..53d1bd06 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 dependencies:
   pre:
-  - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-4.9
+  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-4.9
 checkout:
   post:
   - git submodule init

From b126e07747fc92c8ec2d367957a648242213f1d3 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:05:24 +0200
Subject: [PATCH 20/36] Update circle.yml

Add ppa and install g++ 5 instead.
---
 circle.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 53d1bd06..d8477f1f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,10 @@
+machine:
+  environment:
+  - CXX: "g++-5"
 dependencies:
   pre:
-  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-4.9
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-5
 checkout:
   post:
   - git submodule init

From 2c563f7975ff416168acbef64560b836b2777a69 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:06:51 +0200
Subject: [PATCH 21/36] Update circle.yml

Oops.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index d8477f1f..9f1b1f53 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   environment:
-  - CXX: "g++-5"
+  - CXX: g++-5
 dependencies:
   pre:
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test

From 278f3e44d7b1c7e9d89f0eb8eb96703ae4040b03 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:12:13 +0200
Subject: [PATCH 22/36] Update circle.yml

Oops, again.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 9f1b1f53..ebd03f34 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   environment:
-  - CXX: g++-5
+    CXX: g++-5
 dependencies:
   pre:
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test

From 3af8f0d758eb6463a76d08482243b7ff2dcb69b5 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:14:57 +0200
Subject: [PATCH 23/36] Update circle.yml

Add repository without keyboard input...
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index ebd03f34..5e5c091c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     CXX: g++-5
 dependencies:
   pre:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-5
 checkout:
   post:

From c2c7c547188a88bde1949d9530d5dd05b6c6e83a Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:22:44 +0200
Subject: [PATCH 24/36] Update circle.yml

Install gcc-5 because well why not
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 5e5c091c..383644de 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 dependencies:
   pre:
   - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default g++-5
+  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default gcc-5 g++-5
 checkout:
   post:
   - git submodule init

From d23940c4b708a7fd93125a90319f3eb5d24486c9 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sat, 19 Sep 2015 23:43:20 +0200
Subject: [PATCH 25/36] Update circle.yml

Fine, have it your way, no g++ 5.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 383644de..e9526a38 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 dependencies:
   pre:
   - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default gcc-5 g++-5
+  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
 checkout:
   post:
   - git submodule init

From e5cf2f018d4356beb727c1152862ab08212e9860 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sun, 20 Sep 2015 01:05:25 +0200
Subject: [PATCH 26/36] Update circle.yml

What if I run apt-get update without adding a new ppa?
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e9526a38..7a1b226c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     CXX: g++-5
 dependencies:
   pre:
-  - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
 checkout:
   post:

From 9e5e8fec94be4d55525974ff9594bb4ca3f71505 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sun, 20 Sep 2015 01:10:38 +0200
Subject: [PATCH 27/36] Update circle.yml

Add ppa, but don't apt-get update.
---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 7a1b226c..945c9ef9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,8 +3,8 @@ machine:
     CXX: g++-5
 dependencies:
   pre:
-  # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update; sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
+  - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
 checkout:
   post:
   - git submodule init

From 588ecda36e1c90ea7d57e34e748db617651d5a9c Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Sun, 20 Sep 2015 01:12:54 +0200
Subject: [PATCH 28/36] Update circle.yml

Don't add the ppa, either...
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 945c9ef9..561163d0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     CXX: g++-5
 dependencies:
   pre:
-  - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
 checkout:
   post:

From c0bcab0f0a11d15053600b2756619a22a1e34bd5 Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Sun, 20 Sep 2015 13:29:03 +0200
Subject: [PATCH 29/36] Only install qt5-default.

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 561163d0..7b9ad5a6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 dependencies:
   pre:
   # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential qt5-default
+  - sudo apt-get -y -qq install qt5-default
 checkout:
   post:
   - git submodule init

From 164d50e504887577de0377fe941f14730bca61ed Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Sun, 20 Sep 2015 13:35:54 +0200
Subject: [PATCH 30/36] apt-get update before installing qt5-default.

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 7b9ad5a6..e435a3eb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 dependencies:
   pre:
   # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get -y -qq install qt5-default
+  - sudo apt-get update; sudo apt-get -y -qq install qt5-default
 checkout:
   post:
   - git submodule init

From 4e4cb2a9f17598c2d55e9739564f5484d14b8d6c Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Sun, 20 Sep 2015 13:43:04 +0200
Subject: [PATCH 31/36] apt-get update, but don't install packages.

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e435a3eb..6d223974 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
 dependencies:
   pre:
   # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update; sudo apt-get -y -qq install qt5-default
+  - sudo apt-get update
 checkout:
   post:
   - git submodule init

From 41506f4101e1fc3a36f0787e6a8da95e93ac323a Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 00:11:20 +0200
Subject: [PATCH 32/36] Update circle.yml

Attempting to purge old qt package, as per Circle CI support's instructions.
---
 circle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 6d223974..214e8471 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,9 @@ machine:
 dependencies:
   pre:
   # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update
+  - sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}')
+  - sudo apt-get install netbase
+  - sudo apt-get install libqt5webkit5-dev qt5-default; true
 checkout:
   post:
   - git submodule init

From 18454e99f7f08dc2a21fd4c10ffd977354609c0e Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 00:23:37 +0200
Subject: [PATCH 33/36] Update circle.yml

What happens if we try to build?
---
 circle.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/circle.yml b/circle.yml
index 214e8471..92785c18 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,3 +14,6 @@ checkout:
 test:
   override:
   - echo "Hello Circle!"
+  - cd quick
+  - qmake -r
+  - make

From a8c446da141880c6491608b9b08175bf6b63e8a3 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 00:32:19 +0200
Subject: [PATCH 34/36] Update circle.yml

---
 circle.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 92785c18..2e9b1de6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,10 +3,11 @@ machine:
     CXX: g++-5
 dependencies:
   pre:
-  # - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+  - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}')
   - sudo apt-get install netbase
   - sudo apt-get install libqt5webkit5-dev qt5-default; true
+  - sudo apt-get install g++-5
 checkout:
   post:
   - git submodule init

From 763c8dc88714d1f689480bdf81560ec9cdf88fa3 Mon Sep 17 00:00:00 2001
From: David Hesselbom <davidhesselbom@users.noreply.github.com>
Date: Tue, 22 Sep 2015 00:54:19 +0200
Subject: [PATCH 35/36] Update circle.yml

g++ 4.9, then?
---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 2e9b1de6..cf533b25 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,13 +1,13 @@
 machine:
   environment:
-    CXX: g++-5
+    CXX: g++-4.9
 dependencies:
   pre:
   - yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}')
   - sudo apt-get install netbase
   - sudo apt-get install libqt5webkit5-dev qt5-default; true
-  - sudo apt-get install g++-5
+  - sudo apt-get install g++-4.9
 checkout:
   post:
   - git submodule init

From 147b11686b0f574adce0e8079a76c94e006ce18d Mon Sep 17 00:00:00 2001
From: David Hesselbom <david.hesselbom@gmail.com>
Date: Wed, 23 Dec 2015 00:17:32 +0100
Subject: [PATCH 36/36] Trying to install gcc-4.9 instead of g++-4.9...

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index cf533b25..fac39b7f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ dependencies:
   - sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}')
   - sudo apt-get install netbase
   - sudo apt-get install libqt5webkit5-dev qt5-default; true
-  - sudo apt-get install g++-4.9
+  - sudo apt-get install gcc-4.9
 checkout:
   post:
   - git submodule init