summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf1
-rwxr-xr-xbin/syncqt15
-rw-r--r--mkspecs/features/default_post.prf9
-rw-r--r--mkspecs/features/qt_build_config.prf2
-rw-r--r--mkspecs/features/qt_example_installs.prf5
-rw-r--r--mkspecs/features/qt_module.prf10
-rw-r--r--mkspecs/features/qt_module_fwdpri.prf1
-rw-r--r--mkspecs/features/testcase_targets.prf9
-rw-r--r--src/gui/math3d/qmatrix4x4.cpp2
-rw-r--r--src/gui/math3d/qquaternion.cpp2
-rw-r--r--src/widgets/dialogs/qdialog.cpp2
11 files changed, 24 insertions, 34 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45fb..5de255cb69 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/bin/syncqt b/bin/syncqt
index a10117bf2e..896ee742c5 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -87,7 +87,7 @@ my $mkspecsdir = dirname(dirname($0));
normalizePath(\$mkspecsdir) if (defined $mkspecsdir);
# will be defined based on the modules sync.profile
-our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %modulepris, %explicitheaders, %deprecatedheaders);
+our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %explicitheaders, %deprecatedheaders);
our @qpa_headers = ();
# global variables (modified by options)
@@ -810,19 +810,6 @@ foreach my $lib (@modules_to_sync) {
my $module_version = fileContents($project);
$module_version = $qt_version unless ($module_version =~ s,.*^VERSION[ \t]*=[ \t]*(\S+).*,$1,sm);
- # Backwards compatibility for modules with checked in .pri files.
- if (defined $modulepris{$lib} and -e "$modulepris{$lib}") {
- my $content = fileContents($modulepris{$lib});
- my @version_rows = grep(/QT\..*\.VERSION/, split('\n', $content));
- if(@version_rows) {
- # We only pick the first one, since each module need a separate .pri file
- $module_version = $version_rows[0];
- chomp $module_version;
- $module_version =~ s/^\s*QT\..*\.VERSION\s*=\s*([^#]+).*$/$1/;
- $module_version =~ s/\s+$//;
- }
- }
-
my $pathtoheaders = "";
$pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib});
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 6f3f318e0a..5359953d90 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -47,12 +47,3 @@ breakpad {
QMAKE_INCDIR += $$QMAKE_INCDIR_POST
QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
-
-# Let every project have a standard GNU `check' target
-!contains(QMAKE_EXTRA_TARGETS, check) {
- contains(TEMPLATE, subdirs): \
- prepareRecursiveTarget(check)
- else: \
- check.depends = first # `make check' implies build
- QMAKE_EXTRA_TARGETS += check
-}
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 63d6b43c7c..29dd354a31 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -27,8 +27,8 @@ mac {
CONFIG += \
create_prl link_prl \
+ testcase_targets \
prepare_docs qt_docs_targets \
- qt_example_installs \
no_private_qt_headers_warning QTDIR_build \
# Qt modules get compiled without exceptions enabled by default.
# However, testcases should be still built with exceptions.
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 72f0b141a7..281552acb6 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -21,6 +21,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
extras = \
$$_PRO_FILE_PWD_/README \
$$files($$_PRO_FILE_PWD_/*.pri) \
+ $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
$$replace(_PRO_FILE_, \\.pro$, .json) \
$$replace(_PRO_FILE_, \\.pro$, .inf)
for(extra, extras): \
@@ -30,6 +31,10 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
# Just for Qt Creator
OTHER_FILES += $$sourcefiles
+ for(inst, INSTALLS): \
+ !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \
+ for(file, $${inst}.files): \
+ sourcefiles += $$files($$absolute_path($$file, $$_PRO_FILE_PWD_))
sourcefiles += \
$$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index eb46481c70..0b6ad86ae1 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -35,14 +35,6 @@ else: \
MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES
load(qt_build_paths)
-
-# This check will be removed soon. Weird indentation to avoid reindenting the code later.
-!isEmpty(MODULE_PRI) {
- !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.")
- MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_)
- exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.")
-} else {
-
MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
!build_pass {
@@ -97,8 +89,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
} # !build_pass
-} # isEmpty(MODULE_PRI)
-
load(qt_module_fwdpri)
INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}.private_includes)
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf
index b7270aea59..0b203b5a90 100644
--- a/mkspecs/features/qt_module_fwdpri.prf
+++ b/mkspecs/features/qt_module_fwdpri.prf
@@ -72,6 +72,7 @@
for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
name depends private_depends module_config CONFIG DEFINES sources \
includes private_includes bins libs libexecs plugins imports qml \
+ rpath_link rpath_link_private \
)):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient)
cache(QT_CONFIG, transient)
diff --git a/mkspecs/features/testcase_targets.prf b/mkspecs/features/testcase_targets.prf
new file mode 100644
index 0000000000..e9b107735a
--- /dev/null
+++ b/mkspecs/features/testcase_targets.prf
@@ -0,0 +1,9 @@
+
+# Let every project have a standard GNU `check' target
+!contains(QMAKE_EXTRA_TARGETS, check) {
+ contains(TEMPLATE, subdirs): \
+ prepareRecursiveTarget(check)
+ else: \
+ check.depends = first # `make check' implies build
+ QMAKE_EXTRA_TARGETS += check
+}
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 4e35d49118..d8c2116b0d 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -45,6 +45,8 @@
#include <QtGui/qmatrix.h>
#include <QtGui/qtransform.h>
+#include <cmath>
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_MATRIX4X4
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index 3f39fa43c3..2ccdd315d3 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -45,6 +45,8 @@
#include <QtCore/qvariant.h>
#include <QtCore/qdebug.h>
+#include <cmath>
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_QUATERNION
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 7b47f4e135..290f0a7f65 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -67,8 +67,10 @@ static inline int themeDialogType(const QDialog *dialog)
if (qobject_cast<const QFileDialog *>(dialog))
return QPlatformTheme::FileDialog;
#endif
+#ifndef QT_NO_COLORDIALOG
if (qobject_cast<const QColorDialog *>(dialog))
return QPlatformTheme::ColorDialog;
+#endif
#ifndef QT_NO_FONTDIALOG
if (qobject_cast<const QFontDialog *>(dialog))
return QPlatformTheme::FontDialog;