This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 018d733b0b379035dbd077c3dd260e5067602624 (commit)
via b9eae493249aaaa118128259d5a96ff0d6d23dce (commit)
from 1a027de1bf0712f9228f398ce33386afa21cd7de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=018d733b0b379035dbd077c3dd260e5067602624
commit 018d733b0b379035dbd077c3dd260e5067602624
Merge: 1a027de b9eae49
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 3 10:22:46 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 3 10:22:46 2013 -0500
Merge topic 'qt4-target-depends' into next
b9eae49 Don't require QtDeclarative.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9eae493249aaaa118128259d5a96ff0d6d23dce
commit b9eae493249aaaa118128259d5a96ff0d6d23dce
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 3 16:21:15 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 3 16:21:15 2013 +0100
Don't require QtDeclarative.
Apparently some machines on the dashboard do not have it available,
particularly the Windows ones, so we're not getting test coverage
there before this patch.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2dd7d8b..924ff38 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -989,7 +989,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc")
endif()
- if(QT4_WORKS AND QT_QTDECLARATIVE_FOUND)
+ if(QT4_WORKS AND QT_QTGUI_FOUND)
add_test(Qt4Targets ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Qt4Targets"
diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index caf04e0..3adff48 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(Qt4 REQUIRED)
include_directories(${QT_INCLUDES})
add_executable(Qt4Targets WIN32 main.cpp)
-target_link_libraries(Qt4Targets Qt4::QtDeclarative)
+target_link_libraries(Qt4Targets Qt4::QtGui)
if (WIN32)
target_link_libraries(Qt4Targets Qt4::qtmain)
diff --git a/Tests/Qt4Targets/main.cpp b/Tests/Qt4Targets/main.cpp
index f14882d..f4890fa 100644
--- a/Tests/Qt4Targets/main.cpp
+++ b/Tests/Qt4Targets/main.cpp
@@ -1,17 +1,16 @@
#include <QApplication>
+#include <QWidget>
-#include <QDeclarativeView>
-
-#include <QUrl>
+#include <QString>
int main(int argc, char **argv)
{
QApplication app(argc, argv);
- QDeclarativeView v;
- v.setSource(QUrl("http://www.example.com"));
- v.show();
+ QWidget w;
+ w.setWindowTitle(QString::fromLatin1("SomeTitle"));
+ w.show();
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
Tests/Qt4Targets/CMakeLists.txt | 2 +-
Tests/Qt4Targets/main.cpp | 11 +++++------
3 files changed, 7 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake