various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

.gitignore

@@ -18,6 +18,6 @@ bindings/*.log
 # build directories to ignore
 # ---------------------
 apidocs
-build
 minsize
+oldmake
 debug

CMakeLists.txt

@@ -43,7 +43,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "4")
 set(CPACK_PACKAGE_VERSION_MINOR "9")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_SET_DESTDIR TRUE)
-set(CPACK_SOURCE_IGNORE_FILES "/build/;/minsize/;/debug/;/apidocs/;/.git;${CPACK_SOURCE_IGNORE_FILES}")
+set(CPACK_SOURCE_IGNORE_FILES "/minsize/;/debug/;/oldmake/;/apidocs/;/.git;${CPACK_SOURCE_IGNORE_FILES}")
 set(CPACK_STRIP_FILES TRUE)
 if(NOT CMAKE_VERSION VERSION_LESS "3.1.0")
     set(CPACK_GENERATOR "TXZ")

scripts/debug.sh

@@ -11,8 +11,8 @@ cd "$cwd/../debug"
 export CC=clang CXX=clang++
 # undefined,float-cast-overflow,thread,memory,address
 sanitizers="address"
-export CXXFLAGS="$CXXFLAGS -fsanitize=$sanitizers -fno-omit-frame-pointer -fno-optimize-sibling-calls"
-export LDFLAGS="$LDFLAGS -fsanitize=$sanitizers"
+export CXXFLAGS="$CXXFLAGS -Wall -fsanitize=$sanitizers -fno-omit-frame-pointer -fno-optimize-sibling-calls"
+export LDFLAGS="$LDFLAGS -Wall -fsanitize=$sanitizers"
 
 cmake ../ -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_INSTALL_PREFIX=/usr \

scripts/fastdev.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cwd="$(dirname $0)"
-
-rm -rf "$cwd/../fastdev"
-mkdir -p "$cwd/../fastdev"
-cd "$cwd/../fastdev"
-
-export CFLAGS="$CFLAGS -O0 -Wall"
-export CXXFLAGS="$CXXFLAGS -O0 -Wall"
-
-cmake ../ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKATIE_SETTINGS_FULL=/etc/xdg \
-    -DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-    -DKATIE_PROFILE_FULL=/etc/profile.d $@
-make -j$(nproc || echo 1)

scripts/oldmake.sh

@@ -6,10 +6,10 @@ cwd="$(realpath $(dirname $0))"
 cmake="cmake-2.8.12.2-Linux-i386"
 
 cd "$cwd"
-if which wget; then
-    wget -c "https://cmake.org/files/v2.8/$cmake.tar.gz"
+if which curl; then
+    curl -C - -L "https://cmake.org/files/v2.8/$cmake.tar.gz" -o "$cmake.tar.gz"
 else
-    curl -C - "https://cmake.org/files/v2.8/$cmake.tar.gz" -o "$cmake.tar.gz"
+    wget -c "https://cmake.org/files/v2.8/$cmake.tar.gz"
 fi
 
 rm -rf "$cwd/../oldmake"

src/core/io/qtextstream.cpp

@@ -228,12 +228,12 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
 #include "qbuffer.h"
 #include "qfile.h"
 #include "qnumeric.h"
+#include "qlocale_p.h"
 #ifndef QT_NO_TEXTCODEC
 #include "qtextcodec.h"
 #endif
-#include <locale.h>
-#include "qlocale_p.h"
 
+#include <locale.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <new>