* fix build using Qt IDE installed via aqt

- use crash reporter on release build only

Author: hazmi-e205

.gitignore

@@ -49,4 +49,5 @@ assert.log
 /Prj/Qt**
 /Prj/Build**
 /Scripts/premake5**
+/Qt
 /Qt**

Prj/premake5.lua

@@ -118,22 +118,35 @@ project "iDebugTool"
             "Iphlpapi",
             "Ws2_32",
             "Ole32",
-            "Dbghelp",
-            "exchndl",
             "mingw-patch",
         }
-        libdirs
-        {
-            "../Prebuilt/drmingw-win64/lib",
-        }
         includedirs
         {
-            "../Prebuilt/drmingw-win64/include",
             "../Externals/mingw-patch",
         }
-        local drmingw = "$$PWD/../../../Prebuilt/drmingw-win64/bin"
-        prelinkcommands {"python " .. copyext .. " mgwhelp.dll " .. drmingw .. " " .. copydst}
-        prelinkcommands {"python " .. copyext .. " exchndl.dll " .. drmingw .. " " .. copydst}
+
+        filter {"Release*"}
+            defines
+            {
+                "MINGW_REPORTER",
+            }
+            links
+            {
+                "Dbghelp",
+                "exchndl",
+            }
+            libdirs
+            {
+                "../Prebuilt/drmingw-win64/lib",
+            }
+            includedirs
+            {
+                "../Prebuilt/drmingw-win64/include",
+            }
+            local drmingw = "$$PWD/../../../Prebuilt/drmingw-win64/bin"
+            prelinkcommands {"python " .. copyext .. " mgwhelp.dll " .. drmingw .. " " .. copydst}
+            prelinkcommands {"python " .. copyext .. " exchndl.dll " .. drmingw .. " " .. copydst}
+        filter {}
     else
         links
         {

Prj/qt.lua

@@ -118,6 +118,16 @@ function qt.parse_links(prj)
             table.insert(links["Common"], link)
         end
     end
+    
+    -- for precompiled
+    for cfg in project.eachconfig(prj) do
+        local filtered_links = qt.remove_item_by_list(cfg.links, prj.links)
+        if #filtered_links > 0 then
+            for _,link in ipairs(filtered_links) do
+                table.insert(links[cfg.buildcfg], link)
+            end
+        end
+    end
 end
 
 function qt.add_links(tab, datatable)
@@ -137,19 +147,22 @@ function qt.add_libdirs(tab, datatable, prj)
     if #datatable > 0 then
         _p(tab, 'LIBS += \\')
         for k,v in ipairs(datatable) do
-            local relative_str = path.getrelative(prj.location .. "/" .. prj.name, v)
+            -- Currently, qmake  unstable for libdirs using relative path
+            local relative_str = v -- path.getrelative(prj.location .. "/" .. prj.name, v)
             if k ~= #datatable then
                 relative_str = relative_str .. ' \\'
             end
             _p(tab + 1, '-L' .. relative_str)
+
         end
         _p('')
     end
 end
 
 function qt.add_targetdir(tab, prj)
     if prj.targetdir then
-        local relative_str = path.getrelative(prj.location .. "/" .. prj.name, prj.targetdir)
+        -- unstable relative path beetween ide and cli
+        local relative_str = prj.targetdir -- path.getrelative(prj.location .. "/" .. prj.name, prj.targetdir)
         _p(tab, 'DESTDIR = ' .. relative_str)
     end
 end
@@ -168,6 +181,19 @@ function qt.get_targetname(prj)
     return outname
 end
 
+function qt.add_commands(tab, flagname, datatable)
+    if #datatable > 0 then
+        _p(tab, flagname .. ' += \\')
+        for k,v in ipairs(datatable) do
+            if k ~= #datatable then
+                v = v .. ' && \\'
+            end
+            _p(tab + 1, v)
+        end
+        _p('')
+    end
+end
+
 function qt.remove_item_by_list(full_table, remove_list)
     for i=1, #full_table do
         for k,v in ipairs(full_table) do
@@ -285,28 +311,9 @@ function qt.project_pro(prj)
         end
         _p('')
     end
-
-    if #prj.prelinkcommands > 0 then
-        _p('QMAKE_PRE_LINK += \\')
-        for k,v in ipairs(prj.prelinkcommands) do
-            if k ~= #prj.prelinkcommands then
-                v = v .. ' &&\\'
-            end
-            _p(1, v)
-        end
-        _p('')
-    end
-
-    if #prj.postbuildcommands > 0 then
-        _p('QMAKE_POST_LINK += \\')
-        for k,v in ipairs(prj.postbuildcommands) do
-            if k ~= #prj.postbuildcommands then
-                v = v .. ' \\'
-            end
-            _p(1, v)
-        end
-        _p('')
-    end
+    
+    qt.add_commands(0, 'QMAKE_PRE_LINK', prj.prelinkcommands)
+    qt.add_commands(0, 'QMAKE_POST_LINK', prj.postbuildcommands)
 
     -- links
     qt.parse_links(prj)
@@ -346,6 +353,12 @@ function qt.project_pro(prj)
 
         local includedirs = qt.remove_item_by_list(cfg.includedirs, prj.includedirs)
         qt.add_includedirs(1, includedirs, cfg)
+
+        local prelinkcommands = qt.remove_item_by_list(cfg.prelinkcommands, prj.prelinkcommands)
+        qt.add_commands(1, 'QMAKE_PRE_LINK', prelinkcommands)
+
+        local postbuildcommands = qt.remove_item_by_list(cfg.postbuildcommands, prj.postbuildcommands)
+        qt.add_commands(1, 'QMAKE_POST_LINK', postbuildcommands)
         _p('}')
         _p('')
     end

Scripts/make.py

@@ -206,7 +206,7 @@ def Premake():
 def InstallAQT():
     global qt_dir
     qt_platform = "linux" if "linux" in sys.platform else "windows"
-    qt_dir = os.path.abspath(base_dir + "/Qt/")
+    qt_dir = os.path.abspath("{}/Qt_{}/".format(base_dir, qt_platform))
     qt_list = os.listdir(qt_dir) if os.path.exists(qt_dir) else {}
     if qt_version not in qt_list:
         utils.call([sys.executable, "-m", "pip", "install", "aqtinstall"], base_dir)
@@ -220,11 +220,19 @@ def InstallAQT():
     if (compiler_name + nodotversion.replace(".","") + "_" + compiler_arch) not in qt_list and "linux" not in sys.platform:
         utils.call([sys.executable, "-m", "aqt", "install-tool", qt_platform, "desktop", aqt_compiler, "--outputdir", qt_dir], base_dir)
     if is_aqtcreator and "QtCreator" not in qt_list:
-        utils.call([sys.executable, "-m", "aqt", "install-tool", qt_platform, "desktop", "tools_" + aqt_creator, "qt.tools." + aqt_creator, "--outputdir", qt_dir], base_dir)
+        qtcreator_dir = os.path.abspath(qt_dir + "/Tools/QtCreator/")
+        utils.call([sys.executable, "-m", "aqt", "install-tool", qt_platform, "desktop", "tools_" + aqt_creator, "qt.tools." + aqt_creator, "--outputdir", qt_dir if "linux" in sys.platform else qtcreator_dir], base_dir)
         if "linux" not in sys.platform:
             utils.call([sys.executable, "-m", "aqt", "install-tool", qt_platform, "desktop", "tools_" + aqt_creator, "qt.tools.qtcreatorcdbext", "--outputdir", qt_dir], base_dir)
 
 
+def SetupBuildEnvironment():
+    nodotversion  = compiler_version
+    compiler_dir  = qt_dir + "/Tools/" + compiler_name + nodotversion.replace(".","") + "_" + compiler_arch + "/bin/"
+    split = [ x for x in os.environ["PATH"].split(os.pathsep) if "mingw" not in x ]
+    os.environ["PATH"] = os.pathsep.join(split) + os.pathsep + os.pathsep.join([os.path.abspath(compiler_dir)])
+
+
 def Build():
     cprint("Build '"+ prj_type + "' started...", 'yellow', attrs=['reverse', 'blink'])
     prj_path      = prj_dir + "/" + prj_type + "/" + prj_name + ".pro"
@@ -235,7 +243,7 @@ def Build():
     compiler_dir  = qt_dir + "/Tools/" + compiler_name + nodotversion.replace(".","") + "_" + compiler_arch + "/bin/"
     make_path     = ("make" if "linux" in sys.platform else (compiler_dir + "mingw32-make")) + exe_ext
     build_final   = build_dir + "/" + prj_type + "/bin/"
-    os.environ["PATH"] += os.pathsep + os.pathsep.join([compiler_dir])
+    SetupBuildEnvironment()
 
     cprint("Generate makefile from qmake...", 'yellow', attrs=['reverse', 'blink'])
     if not os.path.exists(build_cache):
@@ -301,7 +309,8 @@ def OpenCreator():
     nodotversion  = compiler_version
     mingw_dir  = qt_dir + "/Tools/" + compiler_name + nodotversion.replace(".","") + "_" + compiler_arch + "/bin"
     os.environ["PATH"] += os.pathsep + os.pathsep.join([mingw_dir])
-    
+
+    SetupBuildEnvironment()
     utils.call([CreatorPath, prj_path], base_dir)
 
 

Src/main.cpp

@@ -1,15 +1,15 @@
 #include "mainwindow.h"
 #include <QApplication>
 #include <QMessageBox>
-#if defined(WIN32)
+#if defined(MINGW_REPORTER)
 #include "exchndl.h"
 #include "utils.h"
 #endif
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-#if defined(WIN32)
+#if defined(MINGW_REPORTER)
     QString filename = QCoreApplication::applicationName() + "_CrashReports.txt";
     CheckDrMinGWReports(filename, [](QString filepath, int count){
         QString  message = QString("Sorry, %1 has crashed in %2 time(s). A log file was written to:\n\n%3\n\n").arg(QCoreApplication::applicationName()).arg(count).arg(filepath);