Commit 297c6ae5 authored by promayon's avatar promayon
Browse files

FIXED Ubuntu12.10 now in the "supported" list for packaging

FIXED minor Qt warning QLayout: Attempting to add QLayout "" to QFrame "", which already has a layout
FIXED minor Qt Warning Object::connect: No such slot QtVariantPropertyManager::slotEchoModeChanged



git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@240 ec899d31-69d1-42ba-9299-647d76f65fb3
parent be3ee4e9
......@@ -151,10 +151,10 @@ if (UNIX AND NOT WIN32)
# We need to alter the architecture names as per distro rules
if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
set(CPACK_PACKAGE_ARCHITECTURE i386)
endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
endif()
if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
set(CPACK_PACKAGE_ARCHITECTURE amd64)
endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
endif()
# Set the dependencies based on the distrib version
# Installation path
......@@ -168,15 +168,18 @@ if (UNIX AND NOT WIN32)
# set(LSB_DISTRIB Ubuntu11.10)
# Dependencies depending on the Operating System.
# Ubuntu
# Ubuntu11.10
if("${LSB_DISTRIB}" MATCHES "Ubuntu11.10")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-dev, libinsighttoolkit3.20, libxml2, libvtk5.6-qt4, libxerces-c3.1 ")
endif("${LSB_DISTRIB}" MATCHES "Ubuntu11.10")
# For Ubuntu11.04
endif()
# For Ubuntu12.04
if("${LSB_DISTRIB}" MATCHES "Ubuntu12.04")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-dev, libinsighttoolkit3.20, libxml2, libvtk5.8-qt4, libxerces-c3.1 ")
endif("${LSB_DISTRIB}" MATCHES "Ubuntu12.04")
endif()
# For Ubuntu12.10
if("${LSB_DISTRIB}" MATCHES "Ubuntu12.10")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-dev, libinsighttoolkit3.20, libxml2, libvtk5.8-qt4, libxerces-c3.1 ")
endif()
# Debian
# if("${LSB_DISTRIB}" MATCHES "Debian5.*")
# set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk2.0-0, libsqlite3-0, libglade2-0, libgegl-0.0-0, libcairo2, libexiv2-5, liblcms1, libjpeg62, libpng12-0, liblensfun0, liblensfun-data")
......@@ -188,9 +191,9 @@ if (UNIX AND NOT WIN32)
if(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/darktable-packaging.cmake before packaging.")
endif(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
endif()
endif("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
endif()
# package name
string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CAMITK_VER_NICKNAME}-${LSB_DISTRIB}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
......
......@@ -55,7 +55,7 @@ IF( WIN32 )
ENDIF( WIN32 )
IF( UNIX )
FIND_PATH(OpenCV_DIR "OpenCVConfig.cmake" PATHS /usr/share/opencv /usr/lib/opencv )
FIND_PATH(OpenCV_DIR "OpenCVConfig.cmake" PATHS /usr/share/opencv /usr/lib/opencv /usr/share/OpenCV)
ENDIF( UNIX )
......@@ -169,4 +169,4 @@ if(OpenCV_FOUND)
set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE)
endif(OpenCV_BACKWARD_COMPA)
endif(OpenCV_FOUND)
##====================================================
\ No newline at end of file
##====================================================
......@@ -272,7 +272,7 @@ Load* LoadsEditor::createNewLoad() {
QDialog *dlg = new QDialog(this);
dlg->setWindowTitle("Choose New Load Type...");
QVBoxLayout * dialogLayout = new QVBoxLayout(dlg);
QVBoxLayout * dialogLayout = new QVBoxLayout();
// build the interface
// load type
......@@ -297,7 +297,7 @@ Load* LoadsEditor::createNewLoad() {
dialogLayout->addWidget(groupBox);
// ok/cancel
QHBoxLayout *hbox = new QHBoxLayout(/*vbox*/);
QHBoxLayout *hbox = new QHBoxLayout();
QPushButton *ok = new QPushButton("Ok");
QPushButton *cancel = new QPushButton("Cancel");
ok->setDefault(true);
......
......@@ -112,7 +112,6 @@ QWidget * MedicalImageViewer::getWidget(QWidget * parent) {
//-- init layout
frameLayout = new QGridLayout(frame);
frameLayout->setObjectName("MedicalImageViewer::frameLayout");
frameLayout->setSpacing(0);
frameLayout->setMargin(0);
......@@ -132,8 +131,7 @@ QWidget * MedicalImageViewer::getWidget(QWidget * parent) {
viewers.insert(VIEWER_SAGITTAL, InteractiveViewer::getSagittalViewer());
//-- add the InteractiveViewers
topLeftLayout = new QVBoxLayout(frame);
topLeftLayout->setObjectName("MedicalImageViewer::topLeftLayout");
topLeftLayout = new QVBoxLayout();
frameLayout->addLayout(topLeftLayout, 0, 0);
topLeftLayout->addWidget(InteractiveViewer::getAxialViewer()->getWidget(frame)); // north-west
topLeftLayout->addWidget(InteractiveViewer::getArbitraryViewer()->getWidget(frame)); // north-west
......
project(QTPROPERTYBROWSER)
# For last version of this code see
# http://qt.gitorious.org/qt-solutions/qt-solutions/trees/master/qtpropertybrowser
cmake_minimum_required(VERSION 2.6)
set(QT_MIN_VERSION "4.6.0")
......
......@@ -126,6 +126,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, bool))
Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, const QString &))
Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int))
Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, const QDate &))
Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &))
Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, const QTime &))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment