Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • cali
  • dev
  • master
3 results

Target

Select target project
  • sugu/vimba
1 result
Select Git revision
  • cali
  • dev
  • master
3 results
Show changes
Commits on Source (2)
......@@ -207,7 +207,7 @@
#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
#define __FLT_MANT_DIG__ 24
#define __LDBL_DECIMAL_DIG__ 21
#define __VERSION__ "11.3.0"
#define __VERSION__ "11.4.0"
#define __UINT64_C(c) c ## UL
#define __cpp_unicode_characters 201411L
#define _STDC_PREDEF_H 1
......@@ -408,7 +408,7 @@
#define __DEC128_MAX_EXP__ 6145
#define __FLT32X_HAS_QUIET_NAN__ 1
#define __ATOMIC_CONSUME 1
#define __GNUC_MINOR__ 3
#define __GNUC_MINOR__ 4
#define __GLIBCXX_TYPE_INT_N_0 __int128
#define __INT_FAST16_WIDTH__ 64
#define __UINTMAX_MAX__ 0xffffffffffffffffUL
......
......@@ -12,6 +12,10 @@
"path": "../dox",
"name": "dox"
},
{
"path": "~/dox/idiv/camtron",
"name": "dox 2"
},
],
"build_systems":
[
......
......@@ -10,7 +10,7 @@ void loadStyleSheets(const QString& name, MainWindow& mw)
QFile file(name);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
mw.log( "didn't find '" + name + "' in " + QDir::currentPath() );
mw.log( "didn't find '" + name + "'" );
}
else
{
......@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
MainWindow w;
loadStyleSheets("style.qss", w);
loadStyleSheets(QCoreApplication::applicationDirPath()+"/style.qss", w);
w.show();
return a.exec();
......
......@@ -78,6 +78,7 @@ void MainWindow::openCloseCam()
if( b->text() == "open" )
{
auto ret = curCam->Open(VmbAccessModeFull);
// log( QString("foo"));
if( ret == VmbErrorSuccess )
b->setText("close");
log( QString("Open camera"), ret );
......