CHANGELOG

@@ -1,3 +1,22 @@
+0.7.3 - 19.9.2017
+Fixed:
+- Crash when creating an object while handling a Qt meta-call.
+
+0.7.2 - 18.9.2017
+Added:
+- Bindings for the constructors of QImage and QPixmap taking arrays;
+- Bindings for QGraphicsScene::drawItems, QGraphicsView::drawItems and QAbstractVideoBuffer::mapPlanes.
+
+0.7.1 - 10.2.2017
+Fixed:
+- Crashes when calling certain constructors and destructors.
+
+0.7.0 - 5.2.2017
+Added:
+- Bindings for Qt 5.8.
+Fixed:
+- Decreased the size of inlines 24 times, from 60 to 2,5 total size.
+
 0.6.1 - 17.9.2016
 Fixed:
 - Removed all mappings to C# structures because their empty constructors are not correctly wrapped yet.

QtSharp.CLI/Program.cs

@@ -4,8 +4,10 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using CppSharp;
+using CppSharp.Utils;
 
 namespace QtSharp.CLI
 {
@@ -87,18 +89,19 @@ static bool QueryQt(QtInfo qt, bool debug)
             path = Path.GetDirectoryName(qt.Make) + Path.PathSeparator + path;
             Environment.SetEnvironmentVariable("Path", path, EnvironmentVariableTarget.Process);
 
-            string error;
-            qt.Bins = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_BINS", out error);
-            if (!string.IsNullOrEmpty(error))
+            int error;
+            string errorMessage;
+            qt.Bins = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_BINS", out error, out errorMessage);
+            if (!string.IsNullOrEmpty(errorMessage))
             {
-                Console.WriteLine(error);
+                Console.WriteLine(errorMessage);
                 return false;
             }
 
-            qt.Libs = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_LIBS", out error);
-            if (!string.IsNullOrEmpty(error))
+            qt.Libs = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_LIBS", out error, out errorMessage);
+            if (!string.IsNullOrEmpty(errorMessage))
             {
-                Console.WriteLine(error);
+                Console.WriteLine(errorMessage);
                 return false;
             }
 
@@ -111,10 +114,10 @@ static bool QueryQt(QtInfo qt, bool debug)
                 return false;
             }
             qt.LibFiles = GetLibFiles(libsInfo, debug);
-            qt.Headers = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_HEADERS", out error);
-            if (!string.IsNullOrEmpty(error))
+            qt.Headers = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_HEADERS", out error, out errorMessage);
+            if (!string.IsNullOrEmpty(errorMessage))
             {
-                Console.WriteLine(error);
+                Console.WriteLine(errorMessage);
                 return false;
             }
             DirectoryInfo headersInfo = new DirectoryInfo(qt.Headers);
@@ -125,11 +128,11 @@ static bool QueryQt(QtInfo qt, bool debug)
                     headersInfo.Name);
                 return false;
             }
-            qt.Docs = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_DOCS", out error);
+            qt.Docs = ProcessHelper.Run(qt.QMake, "-query QT_INSTALL_DOCS", out error, out errorMessage);
 
             string emptyFile = Platform.IsWindows ? "NUL" : "/dev/null";
             string output;
-            ProcessHelper.Run("gcc", string.Format("-v -E -x c++ {0}", emptyFile), out output, waitForExit: !Platform.IsWindows);
+            ProcessHelper.Run("gcc", $"-v -E -x c++ {emptyFile}", out error, out output);
             qt.Target = Regex.Match(output, @"Target:\s*(?<target>[^\r\n]+)").Groups["target"].Value;
 
             const string includeDirsRegex = @"#include <\.\.\.> search starts here:(?<includes>.+)End of search list";
@@ -138,7 +141,6 @@ static bool QueryQt(QtInfo qt, bool debug)
                 .Select(s => s.Trim()).ToList();
 
             const string frameworkDirectory = "(framework directory)";
-
             qt.SystemIncludeDirs = includeDirs.Where(s => !s.Contains(frameworkDirectory))
                 .Select(Path.GetFullPath);
 
@@ -149,24 +151,6 @@ static bool QueryQt(QtInfo qt, bool debug)
             return true;
         }
 
-        static void ProcessGeneratedInlines ()
-        {
-            if (!Platform.IsWindows)
-                return;
-
-#if DEBUG
-            if (File.Exists("../../../QtSharp.Tests/bin/Debug/QtCore-inlines.dll"))
-                File.Delete("../../../QtSharp.Tests/bin/Debug/QtCore-inlines.dll");
-
-            File.Copy("release/QtCore-inlines.dll", "../../../QtSharp.Tests/bin/Debug/QtCore-inlines.dll");
-#else
-            if (File.Exists("../../../QtSharp.Tests/bin/Release/QtCore-inlines.dll"))
-                File.Delete("../../../QtSharp.Tests/bin/Release/QtCore-inlines.dll");
-
-            File.Copy ("release/QtCore-inlines.dll", "../../../QtSharp.Tests/bin/Release/QtCore-inlines.dll");
-#endif
-        }
-
         public static int Main(string[] args)
         {
             Stopwatch s = Stopwatch.StartNew();
@@ -202,8 +186,6 @@ public static int Main(string[] args)
                 var libFile = qt.LibFiles[i];
                 var libFileName = Path.GetFileNameWithoutExtension(libFile);
                 if (Path.GetExtension(libFile) == ".exe" ||
-                    // QtDeclarative is obsolete and at the same time its headers cause conflicts with its successor of QtQuick
-                    libFileName == "QtDeclarative" || libFileName == "Qt5Declarative" ||
                     // QtQuickTest is a QML module but has 3 main C++ functions and is not auto-ignored
                     libFileName == "QtQuickTest" || libFileName == "Qt5QuickTest")
                 {
@@ -214,8 +196,6 @@ public static int Main(string[] args)
             ConsoleDriver.Run(qtSharp);
             var wrappedModules = qtSharp.GetVerifiedWrappedModules();
 
-            ProcessGeneratedInlines();
-
             if (wrappedModules.Count == 0)
             {
                 Console.WriteLine("Generation failed.");

QtSharp.CLI/QtSharp.CLI.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>QtSharp.CLI</RootNamespace>
     <AssemblyName>QtSharp.CLI</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -63,27 +63,37 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.dll</HintPath>
     </Reference>
     <Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.AST.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.AST.dll</HintPath>
     </Reference>
-    <Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.Generator.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CppSharp.Generator, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Generator.dll</HintPath>
     </Reference>
     <Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.Parser.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.dll</HintPath>
     </Reference>
     <Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.Parser.CLI.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.CLI.dll</HintPath>
     </Reference>
     <Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.2\lib\CppSharp.Runtime.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -111,12 +121,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets" Condition="Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" />
+  <Import Project="..\packages\Baseclass.Contrib.Nuget.Output.2.3.0\build\net40\Baseclass.Contrib.Nuget.Output.targets" Condition="Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.3.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Baseclass.Contrib.Nuget.Output.2.1.0\build\net40\Baseclass.Contrib.Nuget.Output.targets'))" />
+    <Error Condition="!Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.3.0\build\net40\Baseclass.Contrib.Nuget.Output.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Baseclass.Contrib.Nuget.Output.2.3.0\build\net40\Baseclass.Contrib.Nuget.Output.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

QtSharp.CLI/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

QtSharp.CLI/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
-  <package id="CppSharp" version="0.7.2" targetFramework="net451" developmentDependency="true" />
+  <package id="Baseclass.Contrib.Nuget.Output" version="2.3.0" targetFramework="net461" />
+  <package id="CppSharp" version="0.8.14" targetFramework="net461" developmentDependency="true" />
+  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net461" />
 </packages>

QtSharp.Tests/Manual/QtCore/IO/QFileInfoTests.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using NUnit.Framework;
 using QtCore;
 
@@ -8,11 +9,20 @@ namespace QtSharp.Tests.Manual.QtCore.IO
     [TestFixture]
     public class QFileInfoTests
     {
-        private readonly FileInfo _testFilePath1 = new FileInfo("./TestData/TextFile1.txt");
-        private readonly FileInfo _testFilePath2 = new FileInfo("./TestData/TextFile2_1000words.txt");
-        private readonly FileInfo _testFilePath3 = new FileInfo("./TestData/TextFile3_50bytes.txt");
-        private readonly FileInfo _testFilePath4 = new FileInfo("./TestData/DoubleExtension.ext.txt");
+        private readonly FileInfo _testFilePath1;
+        private readonly FileInfo _testFilePath2;
+        private readonly FileInfo _testFilePath3;
+        private readonly FileInfo _testFilePath4;
 
+        public QFileInfoTests()
+        {
+            var dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            Directory.SetCurrentDirectory(dir);
+            _testFilePath1 = new FileInfo($"./TestData/TextFile1.txt");
+            _testFilePath2 = new FileInfo($"./TestData/TextFile2_1000words.txt");
+            _testFilePath3 = new FileInfo($"./TestData/TextFile3_50bytes.txt");
+            _testFilePath4 = new FileInfo($"./TestData/DoubleExtension.ext.txt");
+        }
 
         private QFileInfo _fileInfo;
 

QtSharp.Tests/Manual/QtCore/IO/QUrlTests.cs

@@ -79,7 +79,7 @@ public void TestAuthority()
                 QUrl.ComponentFormattingOption formatting in Enum.GetValues(typeof(QUrl.ComponentFormattingOption)))
             {
                 var s = this.qUrl.Authority(formatting);
-                Assert.IsNotNullOrEmpty(s, "Problem in enum: " + formatting.ToString());
+                Assert.That(s, Is.Not.Null.Or.Empty, "Problem in enum: " + formatting.ToString());
             }
         }
 
@@ -95,7 +95,7 @@ public void TestFragment()
         {
             var s = this.qUrl.Fragment();
 
-            Assert.IsNotNullOrEmpty(s);
+            Assert.That(s, Is.Not.Null.Or.Empty);
         }
 
         [Test]

QtSharp.Tests/Manual/QtCore/Kernel/QObjectTests.cs

@@ -247,7 +247,7 @@ public void TestObjectName()
         {
             var isW = _qObject.ObjectName;
 
-            Assert.IsNullOrEmpty(isW);
+            Assert.That(isW, Is.Not.Null.Or.Empty);
 
             _qObject.ObjectName = "MyObject";
 

QtSharp.Tests/Manual/QtCore/QSysInfoTests.cs

@@ -11,20 +11,18 @@ public class QSysInfoTests
         [Test]
         public void TestWinVersion()
         {
-            var s = QSysInfo.WindowsVersion;
+            var s = QSysInfo.windowsVersion;
 
-            Assert.IsNotNullOrEmpty(s.ToString());
+            Assert.That(s.ToString(), Is.Not.Null.Or.Empty);
         }
 
         [Platform(Exclude = "Win,Linux")]
         [Test]
         public void TestMacintoshVersion()
         {
-            throw new NotImplementedException("Add in QtCore");
+            var s = QSysInfo.macVersion;
 
-            //var s = QSysInfo.MacintoshVersion;
-
-            //Assert.IsNotNullOrEmpty(s.ToString());
+            Assert.That(s.ToString(), Is.Not.Null.Or.Empty);
         }
     }
 }