diff options
author | Arno <arno@disconnect.de> | 2017-12-19 21:38:35 +0100 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2017-12-19 21:51:42 +0100 |
commit | c0d9d2f61b53b42657ac9cc9b601cab5f308ac10 (patch) | |
tree | cd85ecd3da2180be21c3a1c07fbd42b4546d5201 | |
parent | 4b828d497a5c0b99a5ce34a3f9a607ddd7e7d1d7 (diff) | |
download | ShemovCleaner-c0d9d2f61b53b42657ac9cc9b601cab5f308ac10.tar.gz ShemovCleaner-c0d9d2f61b53b42657ac9cc9b601cab5f308ac10.tar.bz2 ShemovCleaner-c0d9d2f61b53b42657ac9cc9b601cab5f308ac10.zip |
Qt update to 5.10
Wow, what a mess! Tried to update QT with this installer thingy, but
that wreaked total havoc. I installed several compilers and QT versions,
but most of the time QtCreator marked the QT header files as missing.
Long story short: In the end I removed everyting, downloaded the online
installer and "did it again". This commit fixes some paths in the build
scripts.
-rw-r--r-- | ShemovCleaner.pro | 108 | ||||
-rw-r--r-- | buildinfo.pl | 7 |
2 files changed, 58 insertions, 57 deletions
diff --git a/ShemovCleaner.pro b/ShemovCleaner.pro index 598f40d..3c2522c 100644 --- a/ShemovCleaner.pro +++ b/ShemovCleaner.pro @@ -1,56 +1,56 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-08-16T06:39:30 -# -#------------------------------------------------- +###################################################################### +# Automatically generated by qmake (3.1) Tue Dec 19 19:09:01 2017 +###################################################################### -QT += core gui sql - -LIBS += "C:\psql\9.5\lib\libpq.lib" - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = ShemovCleaner TEMPLATE = app - - -SOURCES += main.cpp\ - filesorter.cpp \ - torrentparser.cpp \ - torrentdisplay.cpp \ - torrentwidget.cpp \ - shemovcleaner.cpp \ - configurationwidget.cpp \ - filewidget.cpp \ - helper.cpp \ - filedisplay.cpp \ - globals.cpp \ - actorwidget.cpp \ - origindialog.cpp \ - viewer.cpp \ - filecopier.cpp \ - progressdialog.cpp \ - searchwidget.cpp - -HEADERS += \ - filesorter.h \ - torrentparser.h \ - torrentdisplay.h \ - torrentwidget.h \ - shemovcleaner.h \ - configurationwidget.h \ - filewidget.h \ - helper.h \ - filedisplay.h \ - globals.h \ - actorwidget.h \ - origindialog.h \ - viewer.h \ - filecopier.h \ - progressdialog.h \ - searchwidget.h - -DISTFILES += - -RESOURCES += \ - shemovcleaner.qrc +TARGET = ShemovCleaner +INCLUDEPATH += . +QT += sql gui widgets +LIBS += C:/psql/10.1/lib/libpq.lib + +# The following define makes your compiler warn you if you use any +# feature of Qt which has been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +# Input +HEADERS += actorwidget.h \ + configurationwidget.h \ + filecopier.h \ + filedisplay.h \ + filesorter.h \ + filewidget.h \ + globals.h \ + helper.h \ + origindialog.h \ + progressdialog.h \ + searchwidget.h \ + shemovcleaner.h \ + torrentdisplay.h \ + torrentparser.h \ + torrentwidget.h \ + viewer.h +SOURCES += actorwidget.cpp \ + configurationwidget.cpp \ + filecopier.cpp \ + filedisplay.cpp \ + filesorter.cpp \ + filewidget.cpp \ + globals.cpp \ + helper.cpp \ + main.cpp \ + origindialog.cpp \ + progressdialog.cpp \ + searchwidget.cpp \ + shemovcleaner.cpp \ + torrentdisplay.cpp \ + torrentparser.cpp \ + torrentwidget.cpp \ + viewer.cpp +RESOURCES += shemovcleaner.qrc diff --git a/buildinfo.pl b/buildinfo.pl index 057a76c..5ade7b2 100644 --- a/buildinfo.pl +++ b/buildinfo.pl @@ -72,9 +72,10 @@ unlink ("shemovclenaner.cpp"); rename ("shemovcleaner2.cpp", "shemovcleaner.cpp"); open (my $batch, '>', "make.cmd"); -print $batch 'PATH="C:\Qt\5.6\mingw49_32\bin;C:\Qt\Tools\mingw492_32\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\OpenVPN\bin;C:\Progr Files (x86)\GNU\GnuPG\pub;C:\Program Files\Git\cmd;C:\psql\9.5\lib;C:\psql\9.5\bin;C:\psql\9.5\include"', "\n"; -print $batch 'C:\Qt\5.6\mingw49_32\bin\qmake.exe ShemovCleaner.pro -r -spec win32-g++', "\n"; -print $batch 'C:\Qt\Tools\mingw492_32\bin\mingw32-make.exe -j 5', "\n"; +print $batch 'PATH="C:\Qt\5.10.0\mingw53_32\bin;C:\Qt\Tools\mingw530_32\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\OpenVPN\bin;C:\Progr Files (x86)\GNU\GnuPG\pub;C:\Program Files\Git\cmd;C:\psql\10.1\lib;C:\psql\10.1\bin;C:\psql\10.1include"', "\n"; +print $batch 'C:\Qt\5.10.0\mingw53_32\bin\qmake.exe ShemovCleaner.pro -r -spec win32-g++', "\n"; +//print $batch 'C:\Qt\5.10.0\mingw53_32\bin\qmake.exe ShemovCleaner.pro', "\n"; +print $batch 'C:\Qt\Tools\mingw530_32\bin\mingw32-make.exe -j 5', "\n"; print $batch 'copy /Y release\ShemovCleaner.exe ', $finaldest; close($batch); |