Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/qt47/qt-arch.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3064 6f76bdc54801
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3064
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     1
 
--- src/corelib/arch/i386/arch.pri.orig	2009-10-13 17:34:08.000000000 +0200
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     2
 
+++ src/corelib/arch/i386/arch.pri	2009-11-08 21:07:05.732151739 +0100
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     3
 
@@ -1,4 +1,4 @@
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     4
 
 #
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     5
 
 # i386 architecture
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     6
 
 #
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     7
 
-!*-g++*:!*-icc*:SOURCES += $$QT_ARCH_CPP/qatomic_i386.s
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     8
 
+SOURCES += $$QT_ARCH_CPP/qatomic_i386.s
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     9
 
\ No newline at end of file
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    10
 
--- src/corelib/arch/x86_64/arch.pri.orig	2009-10-13 17:34:08.000000000 +0200
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    11
 
+++ src/corelib/arch/x86_64/arch.pri	2009-11-08 21:08:10.361513696 +0100
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    12
 
@@ -1,4 +1,4 @@
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    13
 
 #
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    14
 
 # AMD64 architecture
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    15
 
 #
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    16
 
-solaris-cc*:SOURCES += $$QT_ARCH_CPP/qatomic_sun.s
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    17
 
+SOURCES += $$QT_ARCH_CPP/qatomic_sun.s
upstream/spec-files-extra