Commit 69f0ec6b authored by Julien Wintz's avatar Julien Wintz
Browse files

Merging request #100.

parent 382561af
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:11:53 2010 (+0200)
## Version: $Id$
## Last-Updated: Tue Jul 10 12:23:24 2012 (+0200)
## Last-Updated: Thu Dec 6 14:25:57 2012 (+0100)
## By: Julien Wintz
## Update #: 110
## Update #: 114
######################################################################
##
### Commentary:
......@@ -29,8 +29,8 @@ set(QT_USE_QTNETWORK TRUE)
set(QT_USE_QTTEST TRUE)
set(QT_USE_QTWEBKIT TRUE)
set(QT_USE_QTTEST TRUE)
set(QT_USE_QTDECLARATIVE TRUE)
set(QT_USE_GUI TRUE)
set(QT_USE_QTDECLARATIVE TRUE)
if(WIN32)
set(QT_USE_QTMAIN TRUE)
......@@ -38,10 +38,6 @@ endif(WIN32)
find_package(Qt4 4.6.0 REQUIRED)
if(${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
set(QT_USE_QTDECLARATIVE TRUE)
endif(${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
include(${QT_USE_FILE})
mark_as_advanced(QT_QMAKE_EXECUTABLE)
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 22:21:50 2009 (+0200)
## Version: $Id$
## Last-Updated: Wed Oct 31 12:53:11 2012 (+0100)
## Last-Updated: Thu Dec 6 14:25:08 2012 (+0100)
## By: Julien Wintz
## Update #: 268
## Update #: 269
######################################################################
##
### Commentary:
......
......@@ -3,8 +3,11 @@
<file>dtkFinder.qss</file>
<file>dtkAnchoredBar.qss</file>
<file>dtkSwitch.qml</file>
<file>pixmaps/star.svg</file>
<file>pixmaps/hidden-folder.png</file>
<file>pixmaps/hidden-folder.png</file>
<file>pixmaps/dtk-anchored-bar-action.png</file>
<file>pixmaps/dtk-anchored-bar-add.png</file>
<file>pixmaps/dtk-anchored-bar-handle.png</file>
......
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