diff --git a/app_templates/CMakeLists.txt b/app_templates/CMakeLists.txt index bc615050e6..08691cefcb 100644 --- a/app_templates/CMakeLists.txt +++ b/app_templates/CMakeLists.txt @@ -1,12 +1,9 @@ kdevplatform_add_app_templates( cpp/CMake/cmake_plaincpp - cpp/CMake/cmake_qt4core - cpp/CMake/cmake_qt4core_qtest - cpp/CMake/cmake_qt4gui cpp/CMake/cmake_qt5guiapp cpp/CMake/cmake_kdevplugin cpp/CMake/cmake_qt5-qml2 - cpp/QMake/qmake_qt4guiapp + cpp/QMake/qmake_qt5guiapp cpp/QMake/qt5-qml2 empty ) diff --git a/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.cpp b/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.cpp deleted file mode 100644 index a335458025..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "%{APPNAME}.h" - -#include -#include - -%{APPNAMEID}::%{APPNAMEID}() -{ - QTimer* timer = new QTimer(this); - connect( timer, SIGNAL(timeout()), SLOT(output()) ); - timer->start( 1000 ); -} - -%{APPNAMEID}::~%{APPNAMEID}() -{} - -void %{APPNAMEID}::output() -{ - std::cout << "Hello World!" << std::endl; -} - -#include "%{APPNAME}.moc" diff --git a/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.h b/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.h deleted file mode 100644 index 3f0f233851..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/%{APPNAME}.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef %{APPNAMEID}_H -#define %{APPNAMEID}_H - -#include - -class %{APPNAMEID} : public QObject -{ - Q_OBJECT - -public: - %{APPNAMEID}(); - virtual ~%{APPNAMEID}(); - -private slots: - void output(); -}; - -#endif // %{APPNAMEID}_H diff --git a/app_templates/cpp/CMake/cmake_qt4core/%{PROJECTDIRNAME}.kdev4 b/app_templates/cpp/CMake/cmake_qt4core/%{PROJECTDIRNAME}.kdev4 deleted file mode 100644 index 9bf12adca6..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/%{PROJECTDIRNAME}.kdev4 +++ /dev/null @@ -1,4 +0,0 @@ -[Project] -Name=%{APPNAME} -Manager=KDevCMakeManager -VersionControl=%{VERSIONCONTROLPLUGIN} diff --git a/app_templates/cpp/CMake/cmake_qt4core/CMakeLists.txt b/app_templates/cpp/CMake/cmake_qt4core/CMakeLists.txt deleted file mode 100644 index f2f539b1b4..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project(%{APPNAMELC}) -find_package(Qt4 REQUIRED) - -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) - -set(%{APPNAME}_SRCS %{APPNAME}.cpp main.cpp) - -qt4_automoc(${%{APPNAME}_SRCS}) -add_executable(%{APPNAMELC} ${%{APPNAME}_SRCS}) -target_link_libraries(%{APPNAMELC} ${QT_QTCORE_LIBRARY}) - -install(TARGETS %{APPNAMELC} RUNTIME DESTINATION bin) diff --git a/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate b/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate deleted file mode 100644 index 35e512802e..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate +++ /dev/null @@ -1,71 +0,0 @@ -# KDE Config File -[General] -Name=CMake QtCore C++ -Name[bs]=CMake QtCore C++ -Name[ca]=CMake QtCore C++ -Name[ca@valencia]=CMake QtCore C++ -Name[cs]=CMake QtCore C++ -Name[da]=CMake QtCore C++ -Name[de]=CMake QtCore C++ -Name[el]=CMake QtCore C++ -Name[en_GB]=CMake QtCore C++ -Name[es]=CMake QtCore C++ -Name[et]=CMake QtCore C++ -Name[fi]=CMake QtCore C++ -Name[fr]=CMake QtCore C++ -Name[ga]=CMake QtCore C++ -Name[gl]=CMake QtCore C++ -Name[hu]=CMake QtCore C++ -Name[it]=CMake QtCore C++ -Name[kk]=CMake QtCore C++ -Name[nb]=CMake QtCore C++ -Name[nds]=CMake QtCore C++ -Name[nl]=CMake QtCore C++ -Name[pl]=CMake QtCore C++ -Name[pt]=QtCore em C++ com CMake -Name[pt_BR]=CMake QtCore C++ -Name[ru]=C++ (CMake, QtCore) -Name[sk]=CMake QtCore C++ -Name[sl]=CMake QtCore C++ -Name[sv]=CMake QtCore C++ -Name[tr]=CMake QtCore C++ -Name[uk]=CMake QtCore C++ -Name[x-test]=xxCMake QtCore C++xx -Name[zh_CN]=CMake QtCore C++ -Name[zh_TW]=CMake QtCore C++ -Comment=Qt4 CMake Core application. Generate a CMake/Qt4 based application (crossplatform compatible) -Comment[bs]=Qt4 CMake osnovna aplikacija. Generiše CMake/Qt4 baziranu aplikaciju (kompatibilna s više platformi) -Comment[ca]=Aplicació de nucli de les Qt4 amb CMake. Genera una aplicació basada en CMake/Qt4 (compatible amb multiplataforma) -Comment[ca@valencia]=Aplicació de nucli de les Qt4 amb CMake. Genera una aplicació basada en CMake/Qt4 (compatible amb multiplataforma) -Comment[cs]=Aplikace Qt4 CMake Core. Generuje aplikaci typu CMake/Qt4 (multiplatformní) -Comment[da]=Qt4 CMake Core-program. Genererer et CMake-/Qt4-baseret program (krydsplatform kompatibelt) -Comment[de]=Qt4/CMake-Core-Anwendung. Eine auf CMake und Qt4 basierende Anwendung (plattformunabhängig) erstellen. -Comment[el]=Qt4 CMake Core εφαρμογή. Δημιουργία μιας εφαρμογής με βάση τα CMake/Qt4 (συμβατή με πολλαπλές πλατφόρμες) -Comment[en_GB]=Qt4 CMake Core application. Generate a CMake/Qt4 based application (crossplatform compatible) -Comment[es]=Aplicación Qt4 CMake Core. Genera una aplicación basada en CMake/Qt4 (compatible multiplataforma) -Comment[et]=Qt4 CMake Core rakendus. Rakenduse loomine CMake/Qt4 põhjal (mitmeplatvormne) -Comment[fi]=Qt 4 CMake Core -sovellus. Generoi CMake/Qt4-perustainen sovellus (toimii useissa käyttöjärjestelmissä) -Comment[fr]=Application principale CMake pour Qt4. Génère une application utilisant QMake / Qt4 (compatible multi-plate-forme) -Comment[ga]=Feidhmchlár bunúsach CMake Qt4. Cruthaigh feidhmchlár bunaithe ar CMake/Qt4 (feidhmchlár trasardáin) -Comment[gl]=Aplicativo principal con CMake para Qt4. Xera un aplicativo baseado en QMake/Qt4 (compatíbel con multiplataforma) -Comment[hu]=Qt4 CMake mag alkalmazás. Előállít egy CMake/Qt4 alapú alkalmazást (keresztplatform kompatibilis) -Comment[it]=Applicazione base CMake in Qt4. Genera un'applicazione basata su CMake/Qt4 (multipiattaforma) -Comment[kk]=Qt4 CMake Core бағдарламасы. CMake/Qt4 негіздеген бағдарламаны жасап береді (кроссплатформалық үлесімді) -Comment[nb]=Qt4 CMake kjerneprogram. Lag et program basert på CMake/Qt4 (kryssplattform-kompatibelt) -Comment[nds]=Qt4-CMake-Karnprogramm. Stellt en op CMake un Qt4 opbuut Programm op (över Bedriefümgeven weg kompatibel) -Comment[nl]=Kerntoepassing van Qt4 CMake. Genereert een op CMake/Qt4 gebaseerd programma (crossplatform compatibel) -Comment[pl]=Program jądra Qt4 CMake. Utwórz program oparty na CMake/Qt4 (zgodny z wieloma platformami) -Comment[pt]=Gera uma aplicação baseada no CMake/Qt4 Core (compatível com várias plataformas) -Comment[pt_BR]=Aplicativo principal com CMake para Qt4. Gera um aplicativo em CMake/Qt4 (compatível com várias plataformas) -Comment[ru]=Основа приложения для Qt4 и CMake. Создаёт кроссплатформенное приложение на базе CMake/Qt4. -Comment[sk]=Ústredná aplikácia Qt4 CMake. Generuje aplikáciu založenú na CMake/Qt4 (cross-platformovo kompatibilné) -Comment[sl]=Jedrni program Qt4 CMake. Ustvari program temelječ na CMake/Qt4 (združljiv z več okolji) -Comment[sv]=Qt4 CMake-kärnprogram. Skapa ett CMake/Qt4-baserat program (som fungerar på flera plattformar) -Comment[tr]=Qt4 CMake çekirdek uygulaması. CMake/Qt4 tabanlı bir uygulama oluştur (Çapraz platform uyumlu) -Comment[uk]=Основна програма Qt4 з системою збирання CMake. Створити програму, засновану на CMake/Qt4 (сумісну з декількома платформами) -Comment[x-test]=xxQt4 CMake Core application. Generate a CMake/Qt4 based application (crossplatform compatible)xx -Comment[zh_CN]=生成基于 CMake/Qt4 的应用程序(跨平台兼容) -Comment[zh_TW]=Qt4 CMake Core 應用程式。產生一個 CMake/Qt4 為基礎的使用者介面應用程式（跨平台相容） -ShowFilesAfterGeneration=%{PROJECTDIR}/src/%{APPNAMELC}.cpp -Category=Qt/Terminal -ValidProjectName=^[a-zA-Z_][a-zA-Z0-9_]+$ diff --git a/app_templates/cpp/CMake/cmake_qt4core/main.cpp b/app_templates/cpp/CMake/cmake_qt4core/main.cpp deleted file mode 100644 index a8849748ec..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "%{APPNAME}.h" - - -int main(int argc, char** argv) -{ - QCoreApplication app(argc, argv); - %{APPNAMEID} %{APPNAMELC}; - return app.exec(); -} diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp b/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp deleted file mode 100644 index b3df4372fc..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "%{APPNAME}.h" - -%{APPNAMEID}::%{APPNAMEID}() -{} - -%{APPNAMEID}::~%{APPNAMEID}() -{} - -#include "%{APPNAME}.moc" diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h b/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h deleted file mode 100644 index 9c5c2a983b..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef %{APPNAMEID}_H -#define %{APPNAMEID}_H - -#include - -class %{APPNAMEID} : public QObject -{ - Q_OBJECT - -public: - %{APPNAMEID}(); - virtual ~%{APPNAMEID}(); -}; - -#endif // %{APPNAMEID}_H diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{PROJECTDIRNAME}.kdev4 b/app_templates/cpp/CMake/cmake_qt4core_qtest/%{PROJECTDIRNAME}.kdev4 deleted file mode 100644 index 9bf12adca6..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/%{PROJECTDIRNAME}.kdev4 +++ /dev/null @@ -1,4 +0,0 @@ -[Project] -Name=%{APPNAME} -Manager=KDevCMakeManager -VersionControl=%{VERSIONCONTROLPLUGIN} diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt b/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt deleted file mode 100644 index 72b50caa11..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project(%{APPNAMELC}) -find_package(Qt4 REQUIRED) - -enable_testing() - -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) - -set(%{APPNAME}_SRCS %{APPNAME}.cpp main.cpp) - -qt4_automoc(${%{APPNAME}_SRCS}) -add_executable(%{APPNAMELC} ${%{APPNAME}_SRCS}) -target_link_libraries(%{APPNAMELC} ${QT_QTCORE_LIBRARY}) - -add_subdirectory(tests) - -install(TARGETS %{APPNAMELC} RUNTIME DESTINATION bin) diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate b/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate deleted file mode 100644 index 890b328246..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate +++ /dev/null @@ -1,68 +0,0 @@ -# KDE Config File -[General] -Name=CMake QtTest -Name[bs]=CMake QtTest -Name[ca]=CMake QtTest -Name[ca@valencia]=CMake QtTest -Name[cs]=CMake QtTest -Name[da]=CMake QtTest -Name[de]=CMake QtTest -Name[el]=CMake QtTest -Name[en_GB]=CMake QtTest -Name[es]=CMake QtTest -Name[et]=CMake QtTest -Name[fi]=CMake QtTest -Name[fr]=CMake QtTest -Name[gl]=CMake QtTest -Name[hu]=CMake QtTest -Name[it]=CMake QtTest -Name[kk]=CMake QtTest -Name[nb]=CMake QtTest -Name[nds]=CMake QtTest -Name[nl]=CMake QtTest -Name[pl]=CMake QtTest -Name[pt]=QtTest com CMake -Name[pt_BR]=CMake QtTest -Name[ru]=QtTest (CMake) -Name[sk]=CMake QtTest -Name[sl]=CMake QtTest -Name[sv]=CMake QtTest -Name[tr]=CMake QtTest -Name[uk]=CMake QtTest -Name[x-test]=xxCMake QtTestxx -Name[zh_CN]=CMake QtTest -Name[zh_TW]=CMake QtTest -Comment=Qt4 CMake QTest Core application. Generate a CMake/Qt4 based application (cross-platform) -Comment[bs]=Qt4 CMake QTest osnovna aplikacija. Generiše CMake/Qt4 baziranu aplikaciju (radi s više platformi) -Comment[ca]=Aplicació de nucli QTest de les Qt4 amb CMake. Genera una aplicació basada en CMake/Qt4 (multiplataforma) -Comment[ca@valencia]=Aplicació de nucli QTest de les Qt4 amb CMake. Genera una aplicació basada en CMake/Qt4 (multiplataforma) -Comment[da]=Qt4 CMake QTest Core-program. Genererer et CMake-/Qt4-baseret program (krydsplatform) -Comment[de]=Qt4/CMake/QTest-Core-Anwendung. Eine auf CMake und Qt4 basierende Anwendung (plattformunabhängig) erstellen. -Comment[el]=Qt4 CMake QTest Core εφαρμογή. Δημιουργία μιας εφαρμογής με βάση τα CMake/Qt4 (συμβατή με πολλαπλές πλατφόρμες) -Comment[en_GB]=Qt4 CMake QTest Core application. Generate a CMake/Qt4 based application (cross-platform) -Comment[es]=Aplicación Qt4 CMake QTest Core. Genera una aplicación basada en CMake/Qt4 (compatible multiplataforma) -Comment[et]=Qt4 CMake QTest Core rakendus. Rakenduse loomine CMake/Qt4 põhjal (mitmeplatvormne) -Comment[fi]=Qt4 CMake QTest Core -sovellus. Generoi CMake/Qt4-perustainen sovellus (eri käyttöjärjestelmissä yhteensopiva) -Comment[fr]=Application principale QTest CMake pour Qt4. Génère une application utilisant CMake / Qt4 (compatible multi-plate-forme) -Comment[gl]=Aplicativo principal QTest con CMake para Qt4. Xera un aplicativo baseado en QMake/Qt4 (compatíbel con multiplataforma) -Comment[hu]=Qt4 CMake QTest mag alkalmazás. Előállít egy CMake/Qt4 alapú alkalmazást (keresztplatform) -Comment[it]=Applicazione base QTest CMake in Qt4. Genera un'applicazione basata su CMake/Qt4 (multipiattaforma) -Comment[kk]=Qt4 CMake QTest Core бағдарламасы. CMake/Qt4 негіздеген бағдарламаны жасап береді (кроссплатформалық) -Comment[nb]=Qt4 CMake QTest kjerneprogram. Lag et program basert på CMake/Qt4 (kryssplattform-kompatibelt) -Comment[nds]=Qt4-CMake-QTest-Karnprogramm. Stellt en op CMake un Qt4 opbuut Programm op (över Bedriefümgeven weg kompatibel) -Comment[nl]=Kerntoepassing van Qt4 CMake QTest. Genereert een op CMake/Qt4-gebaseerd programma (crossplatform compatibel) -Comment[pl]=Program jądra Qt4 CMake QTest. Utwórz program oparty na CMake/Qt4 (zgodny z wieloma platformami) -Comment[pt]=Gera uma aplicação baseada no CMake/Qt4 Core com QTest (compatível com várias plataformas) -Comment[pt_BR]=Aplicativo principal QTest com CMake para Qt4. Gera um aplicativo em CMake/Qt4 (compatível com várias plataformas) -Comment[ru]=Основа приложения c QTest для Qt4 и CMake. Создаёт кроссплатформенное приложение на базе CMake/Qt4. -Comment[sk]=Ústredná aplikácia Qt4 CMake QTest. Generuje aplikáciu založenú na CMake/Qt4 (cross-platformové) -Comment[sl]=Jedrni program Qt4 CMake QTest. Ustvari program temelječ na CMake/Qt4 (združljiv z več okolji) -Comment[sv]=Qt4 CMake QTest-kärnprogram. Skapa ett CMake/Qt4-baserat program (som fungerar på flera plattformar) -Comment[tr]=Qt4 CMake QTest Core uygulaması. CMake/Qt4 tabanlı bir uygulama oluştur (çapraz platformlu) -Comment[uk]=Створити програму QTest, засновану на CMake/Qt4 (сумісну з декількома платформами) -Comment[x-test]=xxQt4 CMake QTest Core application. Generate a CMake/Qt4 based application (cross-platform)xx -Comment[zh_CN]=生成基于 CMake/Qt4 的应用程序(跨平台) -Comment[zh_TW]=Qt4 CMake QTest Core 應用程式。產生一個 CMake/Qt4 為基礎的使用者介面應用程式（跨平台相容） -ShowFilesAfterGeneration=%{PROJECTDIR}/src/%{APPNAMELC}.cpp -Category=Qt/Test -ValidProjectName=^[a-zA-Z_][a-zA-Z0-9_]+$ diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp b/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp deleted file mode 100644 index a8849748ec..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "%{APPNAME}.h" - - -int main(int argc, char** argv) -{ - QCoreApplication app(argc, argv); - %{APPNAMEID} %{APPNAMELC}; - return app.exec(); -} diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp b/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp deleted file mode 100644 index 2c3b6f7396..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "%{APPNAME}Test.h" - -void %{APPNAMEID}Test::initTestCase() -{} - -void %{APPNAMEID}Test::init() -{} - -void %{APPNAMEID}Test::cleanup() -{} - -void %{APPNAMEID}Test::cleanupTestCase() -{} - -void %{APPNAMEID}Test::someTest() -{ - QCOMPARE(1,2); -} - -QTEST_MAIN(%{APPNAMEID}Test) - -#include "%{APPNAME}Test.moc" diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h b/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h deleted file mode 100644 index 750aaef345..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef %{APPNAMEID}TEST_H -#define %{APPNAMEID}TEST_H - -#include -#include - -class %{APPNAMEID}Test : public QObject -{ - Q_OBJECT - -private slots: - void initTestCase(); - void init(); - void cleanup(); - void cleanupTestCase(); - void someTest(); -}; - -#endif // %{APPNAMEID}TEST_H diff --git a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt b/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt deleted file mode 100644 index b2caac7366..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) - -set(CMAKE_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -set(%{APPNAME}Test_SRCS %{APPNAME}Test.cpp) - -qt4_automoc(${%{APPNAME}Test_SRCS}) -add_executable(%{APPNAME}Test ${%{APPNAME}Test_SRCS}) -add_test(%{APPNAME}Test %{APPNAME}Test) -target_link_libraries(%{APPNAME}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY}) diff --git a/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp b/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp deleted file mode 100644 index 635252a866..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "%{APPNAME}.h" - -#include -#include -#include -#include - -%{APPNAMEID}::%{APPNAMEID}() -{ - QLabel* label = new QLabel( this ); - label->setText( "Hello World!" ); - setCentralWidget( label ); - QAction* action = new QAction(this); - action->setText( "Quit" ); - connect(action, SIGNAL(triggered()), SLOT(close()) ); - menuBar()->addMenu( "File" )->addAction( action ); -} - -%{APPNAMEID}::~%{APPNAMEID}() -{} - -#include "%{APPNAME}.moc" diff --git a/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h b/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h deleted file mode 100644 index eec15473f2..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef %{APPNAMEID}_H -#define %{APPNAMEID}_H - -#include - -class %{APPNAMEID} : public QMainWindow -{ - Q_OBJECT - -public: - %{APPNAMEID}(); - virtual ~%{APPNAMEID}(); -}; - -#endif // %{APPNAMEID}_H diff --git a/app_templates/cpp/CMake/cmake_qt4gui/%{PROJECTDIRNAME}.kdev4 b/app_templates/cpp/CMake/cmake_qt4gui/%{PROJECTDIRNAME}.kdev4 deleted file mode 100644 index 9bf12adca6..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/%{PROJECTDIRNAME}.kdev4 +++ /dev/null @@ -1,4 +0,0 @@ -[Project] -Name=%{APPNAME} -Manager=KDevCMakeManager -VersionControl=%{VERSIONCONTROLPLUGIN} diff --git a/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt b/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt deleted file mode 100644 index eab8167fc4..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project(%{APPNAMELC}) -find_package(Qt4 REQUIRED) - -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) - -set(%{APPNAME}_SRCS %{APPNAME}.cpp main.cpp) - -qt4_automoc(${%{APPNAME}_SRCS}) -add_executable(%{APPNAMELC} ${%{APPNAME}_SRCS}) -target_link_libraries(%{APPNAMELC} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) - -install(TARGETS %{APPNAMELC} RUNTIME DESTINATION bin) diff --git a/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate b/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate deleted file mode 100644 index a0e6d4270a..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate +++ /dev/null @@ -1,70 +0,0 @@ -# KDE Config File -[General] -Name=CMake Qt-C++ -Name[bs]=CMake Qt-C++ -Name[ca]=CMake Qt-C++ -Name[ca@valencia]=CMake Qt-C++ -Name[cs]=CMake Qt-C++ -Name[da]=CMake Qt-C++ -Name[de]=CMake Qt-C++ -Name[el]=CMake Qt-C++ -Name[en_GB]=CMake Qt-C++ -Name[es]=CMake Qt-C++ -Name[et]=CMake Qt-C++ -Name[fi]=CMake Qt-C++ -Name[fr]=CMake Qt-C++ -Name[ga]=CMake Qt-C++ -Name[gl]=CMake Qt-C++ -Name[hu]=CMake Qt-C++ -Name[it]=CMake Qt-C++ -Name[kk]=CMake Qt-C++ -Name[nb]=CMake Qt-C++ -Name[nds]=CMake Qt-C++ -Name[nl]=CMake Qt-C++ -Name[pl]=CMake Qt-C++ -Name[pt]=Qt-C++ com QMake -Name[pt_BR]=CMake Qt-C++ -Name[ru]=Qt-C++ (CMake) -Name[sk]=CMake Qt-C++ -Name[sl]=CMake Qt-C++ -Name[sv]=CMake Qt-C++ -Name[tr]=CMake Qt-C++ -Name[uk]=CMake Qt-C++ -Name[x-test]=xxCMake Qt-C++xx -Name[zh_CN]=CMake Qt-C++ -Name[zh_TW]=CMake Qt-C++ -Comment=Qt4 CMake Gui application. Generate a CMake/Qt4 based GUI application (crossplatform compatible) -Comment[bs]=Qt4 CMake Gui application. osnovna aplikacija. Generiše CMake/Qt4 baziranu grafičku aplikaciju (kompatibilna s više platformi) -Comment[ca]=Aplicació IGU de les Qt4 amb CMake. Genera una aplicació IGU basada en CMake/Qt4 (compatible amb multiplataforma) -Comment[ca@valencia]=Aplicació IGU de les Qt4 amb CMake. Genera una aplicació IGU basada en CMake/Qt4 (compatible amb multiplataforma) -Comment[da]=Qt4 CMake GUI-program. Genererer et CMake-/Qt4-baseret GUI-program (krydsplatform kompatibelt) -Comment[de]=Qt4/CMake-GUI-Anwendung. Eine auf CMake und Qt4 basierende GUI-Anwendung (plattformunabhängig) erstellen. -Comment[el]=Qt4 CMake Gui εφαρμογή. Δημιουργία μιας CMake/Qt4 εφαρμογής με γραφικό περιβάλλον (συμβατή με πολλαπλές πλατφόρμες) -Comment[en_GB]=Qt4 CMake Gui application. Generate a CMake/Qt4 based GUI application (crossplatform compatible) -Comment[es]=Aplicación con interfaz gráfica Qt4 CMake. Genera una aplicación con interfaz gráfica basada en CMake/Qt4 (compatible multiplataforma) -Comment[et]=Qt4 CMake GUI rakendus. Rakenduse loomine CMake/Qt4 põhjal (mitmeplatvormne) -Comment[fi]=Qt4 CMake Gui -sovellus. Generoi CMake/Qt4-perustainen graafinen käyttöliittymäsovellus (toimii useissa käyttöjärjestelmissä) -Comment[fr]=Application avec interface graphique CMake pour Qt4. Génère une application avec interface graphique utilisant CMake / Qt4 (compatible multi-plate-forme) -Comment[ga]=Feidhmchlár grafach CMake Qt4. Cruthaigh feidhmchlár grafach bunaithe ar CMake/Qt4 (feidhmchlár trasardáin) -Comment[gl]=Aplicativo gráfico con CMake para Qt4. Xera un aplicativo con GUI baseado en CMake/Qt4 (compatíbel con multiplataforma) -Comment[hu]=Qt4 CMake grafikus felületű alkalmazás. Előállít egy CMake/Qt4 alapú grafikus felületű alkalmazást (keresztplatform kompatibilis) -Comment[it]=Applicazione GUI CMake in Qt4. Genera un'applicazione con GUI basata su CMake/Qt4 (multipiattaforma) -Comment[kk]=Qt4 CMake GUI бағдарламасы. CMake/Qt4 негіздеген графикалық интерфейсті бағдарламаны жасап береді (кроссплатформалық үлесімді) -Comment[nb]=Qt4 Cmake Gui-program. Lag et program med grafisk brukerflate basert på CMake/Qt4 (kryssplattform-kompatibelt) -Comment[nds]=Qt4-CMake-Böversietprogramm. En op CMake un Qt4 opbuut Böversiet-Programm opstellen (över Bedriefümgeven weg kompatibel) -Comment[nl]=Gui-toepassing van Qt4 CMake. Genereert een op CMake/Qt4 gebaseerd GUI-programma (crossplatform compatibel) -Comment[pl]=Program Qt4 CMake Gui. Utwórz program oparty na CMake/Qt4 (zgodny z wieloma platformami) -Comment[pt]=Aplicação gráfica do Qt4 com CMake. Gera uma aplicação gráfica baseada no CMake/Qt4 (compatível com várias plataformas) -Comment[pt_BR]=Aplicativo gráfico com CMake para Qt4. Gera um aplicativo de interface em CMake/Qt4 (compatível com várias plataformas) -Comment[ru]=Графическое приложение для Qt4 и CMake. Создаёт графическое кроссплатформенное приложение на базе CMake/Qt4. -Comment[sk]=Ústredná aplikácia Qt4 CMake Gui. Generuje GUI aplikáciu založenú na CMake/Qt4 (cross-platformovo kompatibilné) -Comment[sl]=Program z uporabniškim vmesnikom Qt4 CMake. Ustvari program temelječ na CMake/Qt4 (združljiv z več okolji) -Comment[sv]=Qt4 CMake-program med grafiskt användargränssnitt. Skapa ett CMake/Qt4-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar) -Comment[tr]=Qt4 CMake Gui uygulaması. CMake/Qt4 tabanlı bir arayüz uygulaması oluştur (çapraz platform uyumlu) -Comment[uk]=Програма Qt4 з графічним інтерфейсом і системою збирання CMake. Створити графічну програму, засновану на CMake/Qt4 (сумісну з декількома платформами) -Comment[x-test]=xxQt4 CMake Gui application. Generate a CMake/Qt4 based GUI application (crossplatform compatible)xx -Comment[zh_CN]=生成基于 CMake/Qt4 的图形应用程序(跨平台兼容) -Comment[zh_TW]=Qt4 CMake 使用者介面應用程式。產生一個 CMake/Qt4 為基礎的使用者介面應用程式（跨平台相容） -ShowFilesAfterGeneration=%{PROJECTDIR}/src/%{APPNAMELC}.cpp -Category=Qt/Graphical -ValidProjectName=^[a-zA-Z_][a-zA-Z0-9_]+$ diff --git a/app_templates/cpp/CMake/cmake_qt4gui/main.cpp b/app_templates/cpp/CMake/cmake_qt4gui/main.cpp deleted file mode 100644 index 6f93d8d84d..0000000000 --- a/app_templates/cpp/CMake/cmake_qt4gui/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "%{APPNAME}.h" - - -int main(int argc, char** argv) -{ - QApplication app(argc, argv); - %{APPNAMEID} %{APPNAMELC}; - %{APPNAMELC}.show(); - return app.exec(); -} diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate b/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate deleted file mode 100644 index ba4539d9ec..0000000000 --- a/app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate +++ /dev/null @@ -1,70 +0,0 @@ -# KDE Config File -[General] -Name=Qt4 GUI Application -Name[ca]=Una aplicació IGU per a les Qt4 -Name[ca@valencia]=Una aplicació IGU per a les Qt4 -Name[cs]=Aplikace prostředí Qt4 -Name[de]=Qt-4-Anwendung mit grafischer Oberfläche -Name[el]=Εφαρμογή GUI της Qt4 -Name[en_GB]=Qt4 GUI Application -Name[es]=Aplicación con interfaz gráfica Qt4 -Name[et]=Qt4 GUI rakendus -Name[fa]=کاربرد ونک Qt4 -Name[fi]=Qt4 GUI -sovellus -Name[fr]=Une application graphique avec Qt4 -Name[ga]=Feidhmchlár Grafach Qt4 -Name[gl]=Aplicativo gráfico con Qt4 -Name[hi]=क्यूटी४ जीयूआई अनुप्रयोग -Name[hne]=क्यूटी४ जीयूआई अनुपरयोग -Name[hu]=Qt4 GUI alkalmazás -Name[it]=Applicazione con GUI in Qt5 -Name[lv]=Qt4 GUI programma -Name[nds]=Qt4-Böversietprogramm -Name[ne]=Qt4 GUI अनुप्रयोग -Name[nl]=Qt4-GUI-toepassing -Name[pl]=Aplikacja (GUI) QT4 -Name[pt]=Uma Aplicação Gráfica do Qt4 -Name[pt_BR]=Aplicativo gráfico do Qt4 -Name[ru]=Графическое приложение на Qt4 -Name[sk]=Aplikácia Qt4 GUI -Name[sl]=Grafični program za Qt4 -Name[sv]=Qt4-program med grafiskt användargränssnitt -Name[tr]=Qt4 Arayüz Uygulaması -Name[uk]=Програма Qt4 з графічним інтерфейсом -Name[x-test]=xxQt4 GUI Applicationxx -Name[zh_CN]=Qt4 图形界面应用程序 -Name[zh_TW]=Qt4 使用者介面應用程式 -Category=Qt/Graphical (QMake-based) -Comment=Generate a QMake/Qt4 based application with graphical user interface (crossplatform compatible) -Comment[ca]=Genera una aplicació basada en QMake/Qt4 amb interfície gràfica d'usuari (compatible amb multiplataforma) -Comment[ca@valencia]=Genera una aplicació basada en QMake/Qt4 amb interfície gràfica d'usuari (compatible amb multiplataforma) -Comment[de]=Erstellt eine auf QMake und Qt 4 basierende Anwendung mit grafischer Benutzeroberfläche (Plattformunabhängig) -Comment[el]=Δημιουργία μιας εφαρμογής με βάση τα QMake/Qt4 με γραφικό περιβάλλον (συμβατή με πολλαπλές πλατφόρμες) -Comment[en_GB]=Generate a QMake/Qt4 based application with graphical user interface (crossplatform compatible) -Comment[es]=Genera una aplicación basada en QMake/Qt4 con interfaz gráfica de usuario (compatible multiplataforma) -Comment[et]=Graafilise kasutajaliidesega QMake/Qt-põhise rakenduse loomine (multiplatvormne ühilduvus) -Comment[fa]=یک کاربرد بر مبنای QMake/Qt4 با واسط کاربر نگاره‌ای تولید می‌کند )همساز بین سکویی( -Comment[fi]=Generoi QMake/Qt4-perustainen sovellus graafisella käyttöliittymällä (toimii useissa käyttöjärjestelmissä) -Comment[fr]=Générer une application graphique basée sur CMake / Qt4 (compatible multi-plate-forme) -Comment[ga]=Cruthaigh feidhmchlár bunaithe ar QMake/Qt4 le comhéadan grafach (feidhmchlár trasardáin) -Comment[gl]=Xerar un aplicativo baseado en QMake e Qt 4 cunha interface gráfica de usuario, e compatibilidade con moitas plataformas. -Comment[it]=Genera un'applicazione basata su QMake/Qt4 con interfaccia utente grafica (compatibile multipiattaforma) -Comment[ja]=グラフィカルユーザインターフェースを持つ QMake/Qt4 ベースのアプリケーションを作成 (クロスプラットフォーム) -Comment[lv]=Ģenerē QMake/Qt4 bāzētu programmu ar grafisku lietotāja saskarni (lietojamu uz daudzām platformām) -Comment[nds]=En Programm mit graafsch Böversiet opstellen, dat op QMake un Qt4 opbuut (över Bedriefümgeven weg kompatibel) -Comment[ne]=(क्रसप्लेटफर्मसँग मिल्दोजुल्दो) ग्राफिकल प्रयोगकर्ता इन्टरफेससँग QMake/Qt4 आधारित अनुप्रयोग सिर्जना गर्नुहोस् -Comment[nl]=Genereert een op Qmake/Qt4 gebaseerde toepassing met grafische gebruikersinterface (crossplatform compatible) -Comment[nn]=Lag eit QMake/Qt4-basert program med grafisk brukargrensesnitt (kryssplattform) -Comment[pl]=Generuje program używający QMake i Qt/4 z graficznym interfejsem użytkownika (wieloplatformowy) -Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) -Comment[pt_BR]=Gera um aplicativo em QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) -Comment[ru]=Основа приложения на Qt4 и CMake. Создаёт кроссплатформенное графическое приложение на базе CMake/Qt4. -Comment[sk]=Generovať aplikáciu QMake/Qt4 s grafickým používateľským rozhraním (crossplatformovo kompatibilný) -Comment[sl]=Ustvari program temelječ na QMake/Qt4 z grafičnim uporabniškim vmesnikom (združljiv z več okolji) -Comment[sv]=Skapa ett CMake/Qt4-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar) -Comment[tr]=Grafik arayüz içeren bir QMake/Qt4 tabanlı bir uygulama oluştur (çapraz platform uyumlu) -Comment[uk]=Створити програму, засновану на CMake/Qt4 (сумісну з декількома платформами) -Comment[x-test]=xxGenerate a QMake/Qt4 based application with graphical user interface (crossplatform compatible)xx -Comment[zh_CN]=生成基于 QMake/Qt4 的图形界面应用程序(跨平台兼容) -Comment[zh_TW]=產生一個 QMake/Qt4 為基礎的使用者介面應用程式（跨平台相容） -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 b/app_templates/cpp/QMake/qmake_qt5guiapp/%{PROJECTDIRNAME}.kdev4 similarity index 100% rename from app_templates/cpp/QMake/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 rename to app_templates/cpp/QMake/qmake_qt5guiapp/%{PROJECTDIRNAME}.kdev4 diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/%{PROJECTDIRNAME}.pro b/app_templates/cpp/QMake/qmake_qt5guiapp/%{PROJECTDIRNAME}.pro similarity index 89% rename from app_templates/cpp/QMake/qmake_qt4guiapp/%{PROJECTDIRNAME}.pro rename to app_templates/cpp/QMake/qmake_qt5guiapp/%{PROJECTDIRNAME}.pro index 42570d6c9e..eb185a9629 100644 --- a/app_templates/cpp/QMake/qmake_qt4guiapp/%{PROJECTDIRNAME}.pro +++ b/app_templates/cpp/QMake/qmake_qt5guiapp/%{PROJECTDIRNAME}.pro @@ -1,10 +1,12 @@ TEMPLATE = app +QT += widgets + FORMS += mainwindow.ui SOURCES += main.cpp MOC_DIR = build OBJECTS_DIR = build UI_DIR = build DESTDIR = build diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/main.cpp b/app_templates/cpp/QMake/qmake_qt5guiapp/main.cpp similarity index 100% rename from app_templates/cpp/QMake/qmake_qt4guiapp/main.cpp rename to app_templates/cpp/QMake/qmake_qt5guiapp/main.cpp diff --git a/app_templates/cpp/QMake/qmake_qt4guiapp/mainwindow.ui b/app_templates/cpp/QMake/qmake_qt5guiapp/mainwindow.ui similarity index 100% rename from app_templates/cpp/QMake/qmake_qt4guiapp/mainwindow.ui rename to app_templates/cpp/QMake/qmake_qt5guiapp/mainwindow.ui diff --git a/app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate b/app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate new file mode 100644 index 0000000000..8fd473df8b --- /dev/null +++ b/app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate @@ -0,0 +1,6 @@ +[General] +Name=QMake Qt5 QWidgets GUI Application +Comment=Generate a QMake/Qt5 based GUI application (crossplatform compatible) + +Category=Qt/Graphical (QMake-based) +ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp