From e415236eab3e6a8a127af860f77088b7f7bc5813 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:08:58 +0100 Subject: consistently put {qt,qml}_{module,plugin} at the end of project files this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ib9295d0bd8ce51505af6e39a381a4076c8ee2d6e Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- src/enginio_client/enginio_client.pro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index f3a158d..933f462 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -10,8 +10,6 @@ OTHER_FILES += \ include(../src.pri) -load(qt_module) - SOURCES += \ enginiobackendconnection.cpp \ enginioclient.cpp \ @@ -43,5 +41,6 @@ HEADERS += \ enginiooauth2authentication.h \ enginioreplystate.h - DEFINES += "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\"" + +load(qt_module) -- cgit v1.2.1 From cf717b99fdb1b7221dd556bf3be32feba0ed8afe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:09:09 +0100 Subject: standardize statement order in project files a bit Change-Id: I20422e195b91523aecb61f83fcbee4ef115bd673 Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- src/enginio_client/enginio_client.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index 933f462..f53bde7 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -1,7 +1,8 @@ TARGET = Enginio +MODULE = enginio + QT = core-private network DEFINES += ENGINIOCLIENT_LIBRARY -MODULE = enginio QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf OTHER_FILES += \ -- cgit v1.2.1 From 44e6129edc887819a2e468b624fb290609a7569b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 17:19:13 +0200 Subject: purge unreferenced image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0f66e4c8ceab283a063a152f15a5c86a7649a0c4 Reviewed-by: Jędrzej Nowacki --- examples/enginio/quick/image-gallery/image_gallery80.png | Bin 4945 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 examples/enginio/quick/image-gallery/image_gallery80.png diff --git a/examples/enginio/quick/image-gallery/image_gallery80.png b/examples/enginio/quick/image-gallery/image_gallery80.png deleted file mode 100644 index 6ad8096..0000000 Binary files a/examples/enginio/quick/image-gallery/image_gallery80.png and /dev/null differ -- cgit v1.2.1 From 65f5956b1cc00c58c964d43af16165e59a6f4e02 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 20:42:30 +0200 Subject: fix example installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib3958d8188ab0a377727cf45d6ab5d8742d42137 Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- examples/enginio/enginio.pro | 3 +++ examples/enginio/quick/image-gallery/image-gallery.pro | 3 +++ examples/enginio/quick/quick.pro | 3 +++ examples/enginio/quick/socialtodos/socialtodos.pro | 6 ++++++ examples/enginio/quick/todos/todos.pro | 3 +++ examples/enginio/quick/users/users.pro | 5 ++++- examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro | 3 +++ examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro | 3 +++ examples/enginio/widgets/todos-cpp/todos-cpp.pro | 3 +++ 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/examples/enginio/enginio.pro b/examples/enginio/enginio.pro index eb699a0..ae1323c 100644 --- a/examples/enginio/enginio.pro +++ b/examples/enginio/enginio.pro @@ -6,3 +6,6 @@ qtHaveModule(widgets) { SUBDIRS += quick } } + +EXAMPLE_FILES += \ + common diff --git a/examples/enginio/quick/image-gallery/image-gallery.pro b/examples/enginio/quick/image-gallery/image-gallery.pro index 7cac108..d65d496 100644 --- a/examples/enginio/quick/image-gallery/image-gallery.pro +++ b/examples/enginio/quick/image-gallery/image-gallery.pro @@ -13,3 +13,6 @@ OTHER_FILES += *.qml RESOURCES += \ gallery.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/image-gallery +INSTALLS += target diff --git a/examples/enginio/quick/quick.pro b/examples/enginio/quick/quick.pro index 6433bbc..8c9886d 100644 --- a/examples/enginio/quick/quick.pro +++ b/examples/enginio/quick/quick.pro @@ -5,3 +5,6 @@ SUBDIRS += \ socialtodos \ todos \ users \ + +EXAMPLE_FILES += \ + main.cpp diff --git a/examples/enginio/quick/socialtodos/socialtodos.pro b/examples/enginio/quick/socialtodos/socialtodos.pro index e27f082..8b25667 100644 --- a/examples/enginio/quick/socialtodos/socialtodos.pro +++ b/examples/enginio/quick/socialtodos/socialtodos.pro @@ -19,3 +19,9 @@ OTHER_FILES += \ socialtodos.qml RESOURCES += socialtodos.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/socialtodos +INSTALLS += target + +EXAMPLE_FILES += \ + backendconfig diff --git a/examples/enginio/quick/todos/todos.pro b/examples/enginio/quick/todos/todos.pro index 7e1e486..db26da7 100644 --- a/examples/enginio/quick/todos/todos.pro +++ b/examples/enginio/quick/todos/todos.pro @@ -11,3 +11,6 @@ mac: CONFIG -= app_bundle OTHER_FILES += todo.qml RESOURCES += todo.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/todos +INSTALLS += target diff --git a/examples/enginio/quick/users/users.pro b/examples/enginio/quick/users/users.pro index 12fef03..cfe6a2b 100644 --- a/examples/enginio/quick/users/users.pro +++ b/examples/enginio/quick/users/users.pro @@ -10,4 +10,7 @@ SOURCES += ../main.cpp mac: CONFIG -= app_bundle OTHER_FILES += users.qml Browse.qml Login.qml Register.qml -RESOURCES += users.qrc \ No newline at end of file +RESOURCES += users.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/users +INSTALLS += target diff --git a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro index dd20cf2..d3a5b53 100644 --- a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro +++ b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro @@ -16,3 +16,6 @@ HEADERS += \ FORMS += \ mainwindow.ui + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/cloudaddressbook +INSTALLS += target diff --git a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro index fad9ce1..008b11c 100644 --- a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro +++ b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro @@ -15,3 +15,6 @@ HEADERS += \ mainwindow.h \ imageobject.h \ imagemodel.h + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/image-gallery-cpp +INSTALLS += target diff --git a/examples/enginio/widgets/todos-cpp/todos-cpp.pro b/examples/enginio/widgets/todos-cpp/todos-cpp.pro index 3862441..84547c0 100644 --- a/examples/enginio/widgets/todos-cpp/todos-cpp.pro +++ b/examples/enginio/widgets/todos-cpp/todos-cpp.pro @@ -13,3 +13,6 @@ SOURCES += \ HEADERS += \ mainwindow.h \ todosmodel.h \ + +target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/todos-cpp +INSTALLS += target -- cgit v1.2.1 From d23fb94863da83b71223f9022eb75ea618fef690 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:26 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: Iefc58fb8e042ef45dda8e918fce4ea45ab0fc80d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/enginio_client/doc/qtenginio.qdocconf | 2 +- src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf index ff55798..c021df2 100644 --- a/src/enginio_client/doc/qtenginio.qdocconf +++ b/src/enginio_client/doc/qtenginio.qdocconf @@ -21,7 +21,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtenginio/enginio/widgets +examplesinstallpath = enginio/widgets depends += qtcore qtgui qtwidgets qtnetwork qtquick qtenginioqml qtenginiooverview diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf index f887f9f..5d3f4c5 100644 --- a/src/enginio_plugin/doc/qtenginioqml.qdocconf +++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf @@ -22,7 +22,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtenginio/enginio/quick +examplesinstallpath = enginio/quick depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview -- cgit v1.2.1 From 5bddee78c2fe009610c982615d1d202399e464e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:47 +0200 Subject: Bump version Change-Id: I26dfe1694c088a74d1256e75071a0d6dd2640f30 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a4cf5c1..4044454 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean CONFIG += qt_example_installs -MODULE_VERSION = 1.6.1 +MODULE_VERSION = 1.6.2 -- cgit v1.2.1