corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmke...@apache.org
Subject incubator-corinthia git commit: Fix compilation of Qt app on Linux (and Windows?)
Date Fri, 15 May 2015 16:07:37 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master a238678fa -> b5141c810


Fix compilation of Qt app on Linux (and Windows?)


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/b5141c81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/b5141c81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/b5141c81

Branch: refs/heads/master
Commit: b5141c81018c4f994e01dc52575fbb96439bebba
Parents: a238678
Author: Peter Kelly <peter@uxproductivity.com>
Authored: Fri May 15 23:07:10 2015 +0700
Committer: Peter Kelly <peter@uxproductivity.com>
Committed: Fri May 15 23:07:10 2015 +0700

----------------------------------------------------------------------
 consumers/corinthia/src/CMakeLists.txt  | 6 ------
 consumers/corinthia/src/Editor.h        | 2 +-
 consumers/corinthia/src/JSInterface.cpp | 4 ++--
 consumers/corinthia/src/MainWindow.cpp  | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/b5141c81/consumers/corinthia/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/corinthia/src/CMakeLists.txt b/consumers/corinthia/src/CMakeLists.txt
index ef4b5ae..f0c4090 100644
--- a/consumers/corinthia/src/CMakeLists.txt
+++ b/consumers/corinthia/src/CMakeLists.txt
@@ -51,14 +51,12 @@ link_directories(${LIB_DIRS})
 ###
 ## Qt magic
 ###
-set(CMAKE_PREFIX_PATH         "/usr/local/opt/qt5")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC             ON)
 
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5WebKit REQUIRED)
 find_package(Qt5WebKitWidgets REQUIRED)
-include_directories("/usr/local/opt/qt5/include")
 
 qt5_wrap_ui(UI_HEADERS ${UI_SOURCES})
 source_group("Generated UI Headers" FILES ${UI_HEADERS})
@@ -75,10 +73,6 @@ target_link_libraries(corinthia DocFormats ${LIBS})
 source_group(src FILES ${SOURCES})
 set_property(TARGET corinthia PROPERTY FOLDER consumers)
 
-message(CMAKE_SOURCE_DIR " is " ${CMAKE_SOURCE_DIR})
-message(TARGET_FILE_DIR ":corinthia is " $<TARGET_FILE_DIR:corinthia>)
-message(CMAKE_BINARY_DIR " is " ${CMAKE_BINARY_DIR})
-
 add_custom_command(TARGET corinthia PRE_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_directory
                    ${CMAKE_SOURCE_DIR}/Editor/src ${CMAKE_BINARY_DIR}/share/corinthia/js)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/b5141c81/consumers/corinthia/src/Editor.h
----------------------------------------------------------------------
diff --git a/consumers/corinthia/src/Editor.h b/consumers/corinthia/src/Editor.h
index 117a18d..94ec4a7 100644
--- a/consumers/corinthia/src/Editor.h
+++ b/consumers/corinthia/src/Editor.h
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#import <QWidget>
+#include <QWidget>
 
 class Editor;
 class EditorPrivate;

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/b5141c81/consumers/corinthia/src/JSInterface.cpp
----------------------------------------------------------------------
diff --git a/consumers/corinthia/src/JSInterface.cpp b/consumers/corinthia/src/JSInterface.cpp
index f6b549f..1f01b95 100644
--- a/consumers/corinthia/src/JSInterface.cpp
+++ b/consumers/corinthia/src/JSInterface.cpp
@@ -86,7 +86,7 @@ JSArgs &JSArgs::operator<<(const char *value)
     if (value == NULL)
         _array.append(QJsonValue::Null);
     else
-        _array.append(value);
+        _array.append(QString(value));
     return *this;
 }
 
@@ -184,7 +184,7 @@ void testargs()
     << QString::null
     << QJsonArray()
     << QJsonObject()
-    << QJsonValue("value")
+    << QJsonValue(QString("value"))
     << QRect(1,2,3,4)
     << QPoint(5,6)
     << QSize(7,8)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/b5141c81/consumers/corinthia/src/MainWindow.cpp
----------------------------------------------------------------------
diff --git a/consumers/corinthia/src/MainWindow.cpp b/consumers/corinthia/src/MainWindow.cpp
index cb2a280..72ad8ae 100644
--- a/consumers/corinthia/src/MainWindow.cpp
+++ b/consumers/corinthia/src/MainWindow.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "MainWindow.h"
-#include <QWebView.h>
+#include <QWebView>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QCoreApplication>


Mime
View raw message