diff --git a/libsrc/boblightserver/CMakeLists.txt b/libsrc/boblightserver/CMakeLists.txt index 3bf97fb3..15c2b6e0 100644 --- a/libsrc/boblightserver/CMakeLists.txt +++ b/libsrc/boblightserver/CMakeLists.txt @@ -26,8 +26,6 @@ add_library(boblightserver ${BoblightServer_HEADERS_MOC} ) -qt5_use_modules(boblightserver Widgets) - target_link_libraries(boblightserver hyperion hyperion-utils diff --git a/libsrc/bonjour/CMakeLists.txt b/libsrc/bonjour/CMakeLists.txt index 48371507..20e3f0ed 100644 --- a/libsrc/bonjour/CMakeLists.txt +++ b/libsrc/bonjour/CMakeLists.txt @@ -31,7 +31,7 @@ add_library(bonjour ${Bonjour_RESOURCES_RCC} ) -qt5_use_modules(bonjour Widgets Network) +qt5_use_modules(bonjour Network) target_link_libraries(bonjour hyperion diff --git a/libsrc/bonjour/main.cpp b/libsrc/bonjour/main.cpp deleted file mode 100755 index 3d8db515..00000000 --- a/libsrc/bonjour/main.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the example classes of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#include -#include - -#include - -#include "server.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - Server server; - server.show(); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); - int x = server.exec(); - return x; -} diff --git a/libsrc/bonjour/server.cpp b/libsrc/bonjour/server.cpp deleted file mode 100755 index 06768edf..00000000 --- a/libsrc/bonjour/server.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the example classes of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#include -#include - -#include - -#include "server.h" -#include "bonjourserviceregister.h" -Server::Server(QWidget *parent) - : QDialog(parent) -{ - setWindowModality(Qt::ApplicationModal); - statusLabel = new QLabel; - quitButton = new QPushButton(tr("Quit")); - quitButton->setAutoDefault(false); - - tcpServer = new QTcpServer(this); - if (!tcpServer->listen()) { - QMessageBox::critical(this, tr("Fortune Server"), - tr("Unable to start the server: %1.") - .arg(tcpServer->errorString())); - close(); - return; - } - - statusLabel->setText(tr("The server is running on port %1.\n" - "Run the Fortune Client example now.") - .arg(tcpServer->serverPort())); - - fortunes << tr("You've been leading a dog's life. Stay off the furniture.") - << tr("You've got to think about tomorrow.") - << tr("You will be surprised by a loud noise.") - << tr("You will feel hungry again in another hour.") - << tr("You might have mail.") - << tr("You cannot kill time without injuring eternity.") - << tr("Computers are not intelligent. They only think they are."); - - connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); - connect(tcpServer, SIGNAL(newConnection()), this, SLOT(sendFortune())); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addStretch(1); - buttonLayout->addWidget(quitButton); - buttonLayout->addStretch(1); - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(statusLabel); - mainLayout->addLayout(buttonLayout); - setLayout(mainLayout); - - bonjourRegister = new BonjourServiceRegister(this); - bonjourRegister->registerService(BonjourRecord(tr("Fortune Server on %1").arg(QHostInfo::localHostName()), - QLatin1String("_trollfortune._tcp"), QString()), - tcpServer->serverPort()); - setWindowTitle(tr("Fortune Server")); -} - -void Server::sendFortune() -{ - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_0); - out << (quint16)0; - out << fortunes.at(qrand() % fortunes.size()); - out.device()->seek(0); - out << (quint16)(block.size() - sizeof(quint16)); - - QTcpSocket *clientConnection = tcpServer->nextPendingConnection(); - connect(clientConnection, SIGNAL(disconnected()), - clientConnection, SLOT(deleteLater())); - - clientConnection->write(block); - clientConnection->disconnectFromHost(); -} diff --git a/libsrc/bonjour/server.h b/libsrc/bonjour/server.h deleted file mode 100755 index 45852b11..00000000 --- a/libsrc/bonjour/server.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2004-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the example classes of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef SERVER_H -#define SERVER_H - -#include - -class QLabel; -class QPushButton; -class QTcpServer; -class BonjourServiceRegister; - -class Server : public QDialog -{ - Q_OBJECT - -public: - Server(QWidget *parent = 0); - -private slots: - void sendFortune(); - -private: - QLabel *statusLabel; - QPushButton *quitButton; - QTcpServer *tcpServer; - QStringList fortunes; - BonjourServiceRegister *bonjourRegister; -}; - -#endif diff --git a/libsrc/effectengine/CMakeLists.txt b/libsrc/effectengine/CMakeLists.txt index 6d204203..c153bca8 100644 --- a/libsrc/effectengine/CMakeLists.txt +++ b/libsrc/effectengine/CMakeLists.txt @@ -39,8 +39,6 @@ add_library(effectengine ${EffectEngineSOURCES} ) -qt5_use_modules(effectengine Widgets) - target_link_libraries(effectengine hyperion jsoncpp diff --git a/libsrc/grabber/v4l2/CMakeLists.txt b/libsrc/grabber/v4l2/CMakeLists.txt index 3db5667e..1539bd90 100644 --- a/libsrc/grabber/v4l2/CMakeLists.txt +++ b/libsrc/grabber/v4l2/CMakeLists.txt @@ -25,8 +25,6 @@ add_library(v4l2-grabber ${V4L2_HEADERS_MOC} ) -qt5_use_modules(v4l2-grabber Widgets) - target_link_libraries(v4l2-grabber hyperion ${QT_LIBRARIES} diff --git a/libsrc/hyperion/CMakeLists.txt b/libsrc/hyperion/CMakeLists.txt index 42c611b5..ba551387 100644 --- a/libsrc/hyperion/CMakeLists.txt +++ b/libsrc/hyperion/CMakeLists.txt @@ -53,8 +53,6 @@ add_library(hyperion ${Hyperion_RESOURCES_RCC} ) -qt5_use_modules(hyperion Widgets) - target_link_libraries(hyperion blackborder hyperion-utils diff --git a/libsrc/jsonserver/CMakeLists.txt b/libsrc/jsonserver/CMakeLists.txt index 7888179b..f40baadb 100644 --- a/libsrc/jsonserver/CMakeLists.txt +++ b/libsrc/jsonserver/CMakeLists.txt @@ -33,7 +33,7 @@ add_library(jsonserver ${JsonServer_RESOURCES_RCC} ) -qt5_use_modules(jsonserver Widgets Network) +qt5_use_modules(jsonserver Network) target_link_libraries(jsonserver hyperion diff --git a/libsrc/leddevice/CMakeLists.txt b/libsrc/leddevice/CMakeLists.txt index c2148226..feb0963d 100755 --- a/libsrc/leddevice/CMakeLists.txt +++ b/libsrc/leddevice/CMakeLists.txt @@ -137,7 +137,7 @@ add_library(leddevice ${Leddevice_SOURCES} ) -qt5_use_modules(leddevice Widgets Network) +qt5_use_modules(leddevice Network) target_link_libraries(leddevice hyperion-utils diff --git a/libsrc/protoserver/CMakeLists.txt b/libsrc/protoserver/CMakeLists.txt index 61324dc9..060155a3 100644 --- a/libsrc/protoserver/CMakeLists.txt +++ b/libsrc/protoserver/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(protoserver ${ProtoServer_PROTO_HDRS} ) -qt5_use_modules(protoserver Widgets) +qt5_use_modules(protoserver Gui) target_link_libraries(protoserver hyperion diff --git a/libsrc/udplistener/CMakeLists.txt b/libsrc/udplistener/CMakeLists.txt index 9d7c007b..5b90a7c3 100644 --- a/libsrc/udplistener/CMakeLists.txt +++ b/libsrc/udplistener/CMakeLists.txt @@ -24,8 +24,6 @@ add_library(udplistener ${UDPListener_HEADERS_MOC} ) -qt5_use_modules(udplistener Widgets) - target_link_libraries(udplistener hyperion hyperion-utils diff --git a/libsrc/utils/CMakeLists.txt b/libsrc/utils/CMakeLists.txt index e9dd49e8..3e4c2074 100644 --- a/libsrc/utils/CMakeLists.txt +++ b/libsrc/utils/CMakeLists.txt @@ -49,7 +49,7 @@ add_library(hyperion-utils ${CURRENT_SOURCE_DIR}/jsonschema/JsonSchemaChecker.cpp ) -qt5_use_modules(hyperion-utils Widgets) +qt5_use_modules(hyperion-utils Core) target_link_libraries(hyperion-utils jsoncpp diff --git a/libsrc/webconfig/CMakeLists.txt b/libsrc/webconfig/CMakeLists.txt index c26c5f68..549953e2 100644 --- a/libsrc/webconfig/CMakeLists.txt +++ b/libsrc/webconfig/CMakeLists.txt @@ -38,7 +38,7 @@ add_library(webconfig ${WebConfig_HEADERS_MOC} ) -qt5_use_modules(webconfig Widgets Network) +qt5_use_modules(webconfig Network) target_link_libraries(webconfig hyperion diff --git a/libsrc/xbmcvideochecker/CMakeLists.txt b/libsrc/xbmcvideochecker/CMakeLists.txt index 693cb906..7d300d67 100644 --- a/libsrc/xbmcvideochecker/CMakeLists.txt +++ b/libsrc/xbmcvideochecker/CMakeLists.txt @@ -24,8 +24,6 @@ add_library(xbmcvideochecker ${XBMCVideoChecker_SOURCES} ) -qt5_use_modules(xbmcvideochecker Widgets) - target_link_libraries(xbmcvideochecker hyperion ${QT_LIBRARIES}) diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt index f70f5ba5..ae270576 100644 --- a/src/hyperion-aml/CMakeLists.txt +++ b/src/hyperion-aml/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries(${PROJECT_NAME} pthread ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-dispmanx/CMakeLists.txt b/src/hyperion-dispmanx/CMakeLists.txt index 841203fe..fe903678 100644 --- a/src/hyperion-dispmanx/CMakeLists.txt +++ b/src/hyperion-dispmanx/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries( ${PROJECT_NAME} pthread ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt index 4e91f192..159183e4 100644 --- a/src/hyperion-framebuffer/CMakeLists.txt +++ b/src/hyperion-framebuffer/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries( ${PROJECT_NAME} pthread ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-osx/CMakeLists.txt b/src/hyperion-osx/CMakeLists.txt index c9dcd332..870e2b1f 100644 --- a/src/hyperion-osx/CMakeLists.txt +++ b/src/hyperion-osx/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries( ${PROJECT_NAME} pthread ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt index 1125b5dd..64817c83 100644 --- a/src/hyperion-remote/CMakeLists.txt +++ b/src/hyperion-remote/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(${PROJECT_NAME} getoptPlusPlus ${QT_LIBRARIES}) -qt5_use_modules(${PROJECT_NAME} Widgets Core Network) +qt5_use_modules(${PROJECT_NAME} Gui Core Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt index b9855e89..bf4cb996 100644 --- a/src/hyperion-v4l2/CMakeLists.txt +++ b/src/hyperion-v4l2/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight ) diff --git a/src/hyperion-x11/CMakeLists.txt b/src/hyperion-x11/CMakeLists.txt index 4a6f3d81..d65c4a53 100644 --- a/src/hyperion-x11/CMakeLists.txt +++ b/src/hyperion-x11/CMakeLists.txt @@ -41,6 +41,6 @@ target_link_libraries(${PROJECT_NAME} pthread ) -qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +qt5_use_modules(${PROJECT_NAME} Core Gui Network) install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )