alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build on jenkins

Browse Source 
Don't look for QCA, it hasn't been ported to Qt5 yet, apparently
No need to use Transitional packages anymore
This commit is contained in:
Aleix Pol 2013-11-11 18:40:19 +01:00
parent 392fa639b6
commit ed3e004a0d
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -46,7 +46,6 @@ find_package(KF5 CONFIG REQUIRED KIdleTime ItemModels KWidgetsAddons KWindowSyst
KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets
KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash
KBookmarks KDeclarative KUnitConversion Kross KParts) KBookmarks KDeclarative KUnitConversion Kross KParts)
#find_package(KF5Transitional REQUIRED)
# those are not "done" yet: # those are not "done" yet:
find_package(KIO REQUIRED NO_MODULE) find_package(KIO REQUIRED NO_MODULE)
@ -89,7 +88,7 @@ set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure networ
) )
#FIXME: when we have a qca for qt5, reenable #FIXME: when we have a qca for qt5, reenable
find_package(QCA2 2.0.0 MODULE) # find_package(QCA2 2.0.0 MODULE)
set_package_properties(QCA2 PROPERTIES DESCRIPTION "Support for remote plasma widgets" set_package_properties(QCA2 PROPERTIES DESCRIPTION "Support for remote plasma widgets"
URL "http://delta.affinix.com/qca" URL "http://delta.affinix.com/qca"
TYPE OPTIONAL TYPE OPTIONAL

1
src/shell/CMakeLists.txt
View File

@ -14,7 +14,6 @@ find_path(KDE_MODULES_DIR NAMES KDE4Macros.cmake PATH_SUFFIXES share/cmake/modul
add_definitions(-DHAVE_X11=${HAVE_X11}) add_definitions(-DHAVE_X11=${HAVE_X11})
find_package(Qt5Transitional REQUIRED Core)
find_package(Qt5Qml REQUIRED) find_package(Qt5Qml REQUIRED)
find_package(Qt5Quick REQUIRED) find_package(Qt5Quick REQUIRED)
find_package(Qt5Script REQUIRED) find_package(Qt5Script REQUIRED)