choice qt4 or qt5

lenky0401 · a64d64a4dffae3a56b6fd5a617b6c8ffb6b97546 · lmq3342xja committed Apr 7, 2015 · Apr 7, 2015 · a64d64a
1 parent a361c5b
commit a64d64a4dffae3a56b6fd5a617b6c8ffb6b97546
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,51 +1,80 @@
 project(fcitx-qimpanel)
 cmake_minimum_required(VERSION 2.8.6)
+option(QT_5 "This is a option for QT_5" ON)
+option(QT_4 "This is a option for QT_4" OFF)
+SET(CMAKE_C_FLAGS "-std=c++11 -g -O0  ${CMAKE_C_FLAGS} ${HARDENED_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -g -O0  ${CMAKE_CXX_FLAGS} ${HARDENED_C_FLAGS}")
+if(QT_5)
+    find_package(Fcitx 4.2.7 REQUIRED)
+    find_package(Qt5DBus REQUIRED)
+    find_package(Qt5LinguistTools REQUIRED)
+    find_package(Qt5Quick REQUIRED)
+    find_package(Qt5QuickWidgets REQUIRED)
+    find_package(Qt5Widgets REQUIRED)
 
-find_package(Fcitx 4.2.7 REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5Quick REQUIRED)
-find_package(Qt5QuickWidgets REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-
-include_directories(
-    ${Qt5DBus_INCLUDE_DIRS}
-    ${Qt5Quick_INCLUDE_DIRS}
-    ${Qt5QuickWidgets_INCLUDE_DIRS}
-    ${Qt5Widgets_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(fcitx-qimpanel_RCCS qml.qrc)
-set(fcitx-qimpanel_SRCS main.cpp main_controller.cpp toplevel.cpp
-    main_model.cpp kimpanelagent.cpp candidate_word.cpp system_tray_menu.cpp 
-    my_action.cpp skin/skinbase.cpp skin/skinfcitx.cpp)
-QT5_ADD_DBUS_ADAPTOR(fcitx-qimpanel_SRCS
-    org.kde.impanel.xml
-    kimpanelagent.h
-    PanelAgent)
-
-QT5_ADD_RESOURCES(fcitx-qimpanel_RCC_SRCS ${fcitx-qimpanel_RCCS})
-
-configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
-
-add_executable(fcitx-qimpanel ${fcitx-qimpanel_SRCS} ${fcitx-qimpanel_TRAN_SRCS}
-    ${fcitx-qimpanel_RCC_SRCS})
-set_target_properties(fcitx-qimpanel PROPERTIES AUTOMOC TRUE)
-target_link_libraries(
-    fcitx-qimpanel
-    fcitx-config
-    fcitx-utils
-    ${Qt5DBus_LIBRARIES}
-    ${Qt5Quick_LIBRARIES}
-    ${Qt5QuickWidgets_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES})
-
-set(pkgbindir 	/usr/bin/)
-set(pkgdatadir 	/usr/share/fcitx-qimpanel)
-install(TARGETS fcitx-qimpanel RUNTIME DESTINATION ${pkgbindir})
-install(FILES ${fcitx-qimpanel_TRAN_SRCS} DESTINATION ${pkgdatadir})
-
-add_subdirectory(ubuntu-default-skin)
-add_subdirectory(config-tool)
-add_subdirectory(po)
+    include_directories(
+        ${Qt5DBus_INCLUDE_DIRS}
+        ${Qt5Quick_INCLUDE_DIRS}
+        ${Qt5QuickWidgets_INCLUDE_DIRS}
+        ${Qt5Widgets_INCLUDE_DIRS}
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR})
+
+    configure_file(${PROJECT_SOURCE_DIR}/config_qt5.h.in ${PROJECT_BINARY_DIR}/config.h)
+
+    SET(fcitx-qimpanel_RCCS qml.qrc)
+    set(fcitx-qimpanel_SRCS main.cpp main_controller.cpp toplevel.cpp
+        main_model.cpp kimpanelagent.cpp candidate_word.cpp system_tray_menu.cpp
+        my_action.cpp skin/skinbase.cpp skin/skinfcitx.cpp)
+    QT5_ADD_DBUS_ADAPTOR(fcitx-qimpanel_SRCS
+        org.kde.impanel.xml
+        kimpanelagent.h
+        PanelAgent)
+
+    QT5_ADD_RESOURCES(fcitx-qimpanel_RCC_SRCS ${fcitx-qimpanel_RCCS})
+
+    add_executable(fcitx-qimpanel ${fcitx-qimpanel_SRCS} ${fcitx-qimpanel_RCC_SRCS})
+    set_target_properties(fcitx-qimpanel PROPERTIES AUTOMOC TRUE)
+    target_link_libraries(
+        fcitx-qimpanel
+        fcitx-config
+        fcitx-utils
+        ${Qt5DBus_LIBRARIES}
+        ${Qt5Quick_LIBRARIES}
+        ${Qt5QuickWidgets_LIBRARIES}
+        ${Qt5Widgets_LIBRARIES})
+endif()
+if(QT_4)
+    find_package(Fcitx 4.2.7 REQUIRED)
+    find_package(Qt4 REQUIRED)
+
+    configure_file(${PROJECT_SOURCE_DIR}/config_qt4.h.in ${PROJECT_BINARY_DIR}/config.h)
+
+    include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR})
+
+    SET(fcitx-qimpanel_RCCS qml.qrc)
+    set(fcitx-qimpanel_SRCS main.cpp main_controller.cpp toplevel.cpp
+        main_model.cpp kimpanelagent.cpp candidate_word.cpp system_tray_menu.cpp
+        my_action.cpp skin/skinbase.cpp skin/skinfcitx.cpp)
+    QT4_ADD_DBUS_ADAPTOR(fcitx-qimpanel_SRCS
+        org.kde.impanel.xml
+        kimpanelagent.h
+        PanelAgent)
+
+    QT4_ADD_RESOURCES(fcitx-qimpanel_RCC_SRCS ${fcitx-qimpanel_RCCS})
+
+    add_executable(fcitx-qimpanel ${fcitx-qimpanel_SRCS} ${fcitx-qimpanel_RCC_SRCS})
+    set_target_properties(fcitx-qimpanel PROPERTIES AUTOMOC TRUE)
+    target_link_libraries(fcitx-qimpanel fcitx-config fcitx-utils
+        ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+        ${QT_QTDBUS_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY})
+endif()
+
+    set(pkgbindir 	/usr/bin/)
+    set(pkgdatadir 	/usr/share/fcitx-qimpanel)
+    install(TARGETS fcitx-qimpanel RUNTIME DESTINATION ${pkgbindir})
+
+    add_subdirectory(ubuntu-default-skin)
+    add_subdirectory(config-tool)
+    add_subdirectory(po)
diff --git a/config-tool/CMakeLists.txt b/config-tool/CMakeLists.txt
@@ -1,47 +1,86 @@
 project(fcitx-qimpanel-configtool)
 cmake_minimum_required(VERSION 2.8.6)
-
+option(QT_5 "This is a option for QT_5" ON)
+option(QT_4 "This is a option for QT_4" OFF)
 find_package(Fcitx 4.2.7 REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5Quick REQUIRED)
-find_package(Qt5QuickWidgets REQUIRED)
-
-include_directories(BEFORE
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(fcitx-qimpanel-configtool_RCCS main.qrc)
-
-set(fcitx-qimpanel-configtool_SRCS main.cpp 
-    mainwindow.cpp 
-    main_model.cpp
-    candidate_word.cpp
-    editingskindialog.cpp
-    skin/skinbase.cpp
-    skin/skinfcitx.cpp    
-    )
-set(fcitx-qimpanel-configtool_FORMS mainwindow.ui
-    editingskindialog.ui
-    )
-
-QT5_ADD_RESOURCES(fcitx-qimpanel-configtool_RCC_SRCS ${fcitx-qimpanel-configtool_RCCS})
-QT5_WRAP_UI(helloworld_FORMS_HEADERS ${fcitx-qimpanel-configtool_FORMS})
-
-add_executable(fcitx-qimpanel-configtool ${fcitx-qimpanel-configtool_SRCS} ${fcitx-qimpanel-configtool_TRAN_SRCS}
-    ${fcitx-qimpanel-configtool_RCC_SRCS} ${fcitx-qimpanel-configtool_FORMS})
-set_target_properties(fcitx-qimpanel-configtool PROPERTIES AUTOMOC TRUE)
-
-target_link_libraries(
-    fcitx-qimpanel-configtool
-    fcitx-utils
-    ${Qt5DBus_LIBRARIES}
-    ${Qt5Quick_LIBRARIES}
-    ${Qt5QuickWidgets_LIBRARIES})
-install(FILES fcitx_ubuntukylin.png DESTINATION /usr/share/pixmaps)
-install(FILES fcitx-qimpanel-configtool.desktop DESTINATION /usr/share/applications)
-set(pkgbindir 	/usr/bin/)
-set(pkgdatadir 	/usr/share/fcitx-qimpanel)
-install(TARGETS fcitx-qimpanel-configtool RUNTIME DESTINATION ${pkgbindir})
-install(FILES ${fcitx-qimpanel-configtool_TRAN_SRCS} DESTINATION ${pkgdatadir})
+if(QT_5)
+    find_package(Qt5DBus REQUIRED)
+    find_package(Qt5LinguistTools REQUIRED)
+    find_package(Qt5Quick REQUIRED)
+    find_package(Qt5QuickWidgets REQUIRED)
+
+    configure_file(${PROJECT_SOURCE_DIR}/config_qt5.h.in ${PROJECT_BINARY_DIR}/config.h)
+
+    include_directories(BEFORE
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR})
+
+    SET(fcitx-qimpanel-configtool_RCCS main.qrc)
+
+    set(fcitx-qimpanel-configtool_SRCS main.cpp
+        mainwindow.cpp
+        main_model.cpp
+        candidate_word.cpp
+        editingskindialog.cpp
+        skin/skinbase.cpp
+        skin/skinfcitx.cpp
+        )
+    set(fcitx-qimpanel-configtool_FORMS mainwindow.ui
+        editingskindialog.ui
+        )
+
+    QT5_ADD_RESOURCES(fcitx-qimpanel-configtool_RCC_SRCS ${fcitx-qimpanel-configtool_RCCS})
+    QT5_WRAP_UI(helloworld_FORMS_HEADERS ${fcitx-qimpanel-configtool_FORMS})
+
+    add_executable(fcitx-qimpanel-configtool ${fcitx-qimpanel-configtool_SRCS} ${fcitx-qimpanel-configtool_RCC_SRCS} ${fcitx-qimpanel-configtool_FORMS})
+    set_target_properties(fcitx-qimpanel-configtool PROPERTIES AUTOMOC TRUE)
+
+    target_link_libraries(
+        fcitx-qimpanel-configtool
+        fcitx-utils
+        ${Qt5DBus_LIBRARIES}
+        ${Qt5Quick_LIBRARIES}
+        ${Qt5QuickWidgets_LIBRARIES})
+
+endif()
+if(QT_4)
+    find_package(Qt4 REQUIRED)
+
+    configure_file(${PROJECT_SOURCE_DIR}/config_qt4.h.in ${PROJECT_BINARY_DIR}/config.h)
+
+    include_directories(BEFORE ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR})
+
+    SET(fcitx-qimpanel-configtool_RCCS main.qrc)
+
+    set(fcitx-qimpanel-configtool_SRCS main.cpp
+        mainwindow.cpp
+        main_model.cpp
+        candidate_word.cpp
+        editingskindialog.cpp
+        skin/skinbase.cpp
+        skin/skinfcitx.cpp
+        )
+    set(fcitx-qimpanel-configtool_FORMS mainwindow.ui
+        editingskindialog.ui
+        )
+
+    QT4_ADD_RESOURCES(fcitx-qimpanel-configtool_RCC_SRCS ${fcitx-qimpanel-configtool_RCCS})
+    QT4_WRAP_UI(helloworld_FORMS_HEADERS ${fcitx-qimpanel-configtool_FORMS})
+
+    add_executable(fcitx-qimpanel-configtool ${fcitx-qimpanel-configtool_SRCS} ${fcitx-qimpanel-configtool_RCC_SRCS} ${fcitx-qimpanel-configtool_FORMS})
+    set_target_properties(fcitx-qimpanel-configtool PROPERTIES AUTOMOC TRUE)
 
+    target_link_libraries(fcitx-qimpanel-configtool fcitx-utils
+        ${QT_QTCORE_LIBRARY}
+        ${QT_QTGUI_LIBRARY}
+        ${QT_QTDBUS_LIBRARY}
+        ${QT_QTDECLARATIVE_LIBRARY}
+        #${QT_QTNETWORK_LIBRARY}
+        )
+endif()
+    install(FILES fcitx_ubuntukylin.png DESTINATION /usr/share/pixmaps)
+    install(FILES fcitx-qimpanel-configtool.desktop DESTINATION /usr/share/applications)
+    set(pkgbindir 	/usr/bin/)
+    set(pkgdatadir 	/usr/share/fcitx-qimpanel)
+    install(TARGETS fcitx-qimpanel-configtool RUNTIME DESTINATION ${pkgbindir})
diff --git a/config.h.in → config-tool/config_qt4.h.in b/config.h.in → config-tool/config_qt4.h.in
@@ -1,6 +1,6 @@
 #ifndef ___CONFIG_H___
 #define ___CONFIG_H___
 
-
+#cmakedefine01 IS_QT_4
 
 #endif
diff --git a/config-tool/config_qt5.h.in b/config-tool/config_qt5.h.in
@@ -0,0 +1,6 @@
+#ifndef ___CONFIG_H___
+#define ___CONFIG_H___
+
+#cmakedefine01 IS_QT_5
+
+#endif
diff --git a/config-tool/main.cpp b/config-tool/main.cpp
@@ -3,6 +3,7 @@
 #include <libintl.h>
 #include <QApplication>
 #include <qtextstream.h>
+#include <QTextCodec>
 #include <QTranslator>
 #include "mainwindow.h"
 #include <QDir>
@@ -26,7 +27,15 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 //    app.installTranslator(&translator);
     app.setApplicationName("fcitx-qimpanel-configtool");
+    #ifdef IS_QT_5
 
+    #endif
+    #ifdef IS_QT_4
+        QTextCodec::setCodecForTr(QTextCodec::codecForLocale());
+        QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
+        QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+        QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+    #endif
     QString localPath = qgetenv("HOME") + "/.config/";
     QDir *temp = new QDir;
     if(false == temp->exists(localPath + "fcitx-qimpanel"))
diff --git a/config-tool/main.qrc b/config-tool/main.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/new/prefix1">
-        <file>main.qml</file>
+        <file>qt5_main.qml</file>
+        <file>qt4_main.qml</file>
     </qresource>
 </RCC>
diff --git a/config-tool/main_model.cpp b/config-tool/main_model.cpp
@@ -74,7 +74,7 @@ QString MainModel::tipsString() const {
 void MainModel::setInputStringCursorPos(int pos) {
     setInputString(mInputString.insert(pos, QString("|")));
 }
-
+#ifdef IS_QT_5
 void candidateWordsPropAppend(QQmlListProperty<CandidateWord>* prop, CandidateWord* value)
 {
     Q_UNUSED(prop);
@@ -92,6 +92,36 @@ CandidateWord* candidateWordsPropAt(QQmlListProperty<CandidateWord>* prop, int i
     return static_cast<QList<CandidateWord*>*>(prop->data)->at(index);
 }
 
+QQmlListProperty<CandidateWord> MainModel::candidateWords() {
+
+    return QQmlListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
+        &candidateWordsPropCount, &candidateWordsPropAt, 0);
+}
+#endif
+#ifdef IS_QT_4
+void candidateWordsPropAppend(QDeclarativeListProperty<CandidateWord>* prop, CandidateWord* value)
+{
+    Q_UNUSED(prop);
+    Q_UNUSED(value);
+    return; //Append not supported
+}
+
+int candidateWordsPropCount(QDeclarativeListProperty<CandidateWord>* prop)
+{
+    return static_cast<QList<CandidateWord*>*>(prop->data)->count();
+}
+
+CandidateWord* candidateWordsPropAt(QDeclarativeListProperty<CandidateWord>* prop, int index)
+{
+    return static_cast<QList<CandidateWord*>*>(prop->data)->at(index);
+}
+
+QDeclarativeListProperty<CandidateWord> MainModel::candidateWords() {
+
+    return QDeclarativeListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
+        &candidateWordsPropCount, &candidateWordsPropAt, 0);
+}
+#endif
 void MainModel::setCandidateWords() {
     CandidateWord *candidate;
     QStringList label;
@@ -246,13 +276,6 @@ void MainModel::setCandidateWords() {
     emit candidateWordsChanged();
     emit qmlMainWindowSizeChanged();
 }
-
-QQmlListProperty<CandidateWord> MainModel::candidateWords() {
-
-    return QQmlListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
-        &candidateWordsPropCount, &candidateWordsPropAt, 0);
-}
-
 void MainModel::setHasPrev(const bool hasPrev) {
     mHasPrev = hasPrev;
     emit hasPrevChanged();