git-svn-id: svn://db.shs.com.ru/libs@427 a8b55f48-bf90-11e4-a774-851b48703e85

CMakeLists.txt

@@ -16,6 +16,9 @@ include(SDKMacros.cmake)
 set(LIBPROJECT 1)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
+if(APPLE)
+	include_directories(/usr/local/include)
+endif()
 if(MINGW)
 	find_package(MinGW REQUIRED)
 endif()

qad/graphic/graphic.cpp

@@ -1459,7 +1459,10 @@ void Graphic::updateLegend(bool es) {
 		QPixmap pix(60, 22);
 		pix.fill(back_color);
 		QPainter p(&pix);
-		p.setPen(graphics[i].pen);
+		QPen pen = graphics[i].pen;
+		if (qRound(pen.widthF()) == pen.widthF()) pen.setWidth(pen.width()*thick);
+		else pen.setWidthF(pen.widthF()*thick);
+		p.setPen(pen);
 		p.drawLine(0, pix.height() / 2, pix.width(), pix.height() / 2);
 		p.end();
 		graphics[i].icon = QIcon(pix);